1677 files changed, 0 insertions, 97562 deletions

diff --git a/testing/akonadi/PKGBUILD b/testing/akonadi/PKGBUILD
deleted file mode 100644
index b05aca121..000000000
--- a/testing/akonadi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 164624 2012-08-01 14:43:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=akonadi
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('81156d883b40241cfc0ddb885f55bcfe')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/akonadi/akonadi.install b/testing/akonadi/akonadi.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/testing/akonadi/akonadi.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/alsa-plugins/PKGBUILD b/testing/alsa-plugins/PKGBUILD
deleted file mode 100644
index 7f27f3f21..000000000
--- a/testing/alsa-plugins/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 163052 2012-07-06 15:20:44Z ibiru $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Daniel Ehlers <danielehlers@mindeye.net>
-
-pkgname=alsa-plugins
-pkgver=1.0.25
-pkgrel=2
-pkgdesc="Extra alsa plugins"
-arch=(i686 x86_64)
-url="http://www.alsa-project.org"
-license=(GPL)
-depends=(alsa-lib)
-makedepends=(libpulse jack ffmpeg)
-optdepends=('libpulse: PulseAudio plugin'
-            'jack: Jack plugin'
-            'ffmpeg: libavcodec resampling plugin'
-            'libsamplerate: libsamplerate resampling plugin'
-            'speex: libspeexdsp resampling plugin')
-options=('!libtool')
-source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2"
-        alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
-        alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch)
-md5sums=('038c023eaa51171f018fbf7141255185'
-         '50d9adcda20756d063e676a563c201d9'
-         '697c6275f678d86ded2e5092d8a154c9')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
-  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
-}
diff --git a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
deleted file mode 100644
index cce4f7e7e..000000000
--- a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c
---- alsa-plugins-1.0.25/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
-+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c	2012-06-09 00:42:52.177219012 +0200
-@@ -702,7 +702,6 @@
- 	rec->channels = channels;
- 	rec->format = format;
- 
--	avcodec_init();
- 	avcodec_register_all();
- 
- 	rec->codec = avcodec_find_encoder_by_name("ac3_fixed");
diff --git a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
deleted file mode 100644
index f4ebbf466..000000000
--- a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for 
-the AV_CH_LAYOUT_* defines.
-
-diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c
---- alsa-plugins-1.0.25-original/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
-+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c	2012-06-01 14:59:47.096671464 +0200
-@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t
- #else
-   rec->avctx->sample_fmt = SAMPLE_FMT_S16;
- #endif
--#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
-+#if (LIBAVCODEC_VERSION_MAJOR >= 54)
-+	switch (io->channels) {
-+	case 2:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
-+		break;
-+	case 4:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
-+		break;
-+	case 6:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
-+		break;
-+	default:
-+		break;
-+	}
-+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
-	switch (io->channels) {
- 	case 2:
- 		rec->avctx->channel_layout = CH_LAYOUT_STEREO;
diff --git a/testing/amarok/PKGBUILD b/testing/amarok/PKGBUILD
deleted file mode 100644
index 214f7f200..000000000
--- a/testing/amarok/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 163053 2012-07-06 15:20:55Z ibiru $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.5.0
-pkgrel=5
-pkgdesc="The powerful music player for KDE"
-arch=("i686" "x86_64")
-url="http://amarok.kde.org"
-license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-             'libmygpo-qt')
-optdepends=("libgpod: support for Apple iPod audio devices"
-	        "libmtp: support for portable media devices"
-        	"loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service")
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-	"toolbarfix.patch"
-	"amarok-2.5.0-ffmpeg-fixes.patch"
-	"contextviewfix.patch")
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
-          'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
-          '61193ccc48e9f99b4856eef27fe7a4aaf465feec'
-          'a95e3bfb177adacc268552ae479dd88b70f5f9e1')
-
-build() {
-  cd "${srcdir}"
-
-  patch -Np0 -i "${srcdir}"/toolbarfix.patch
-  patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch
-
-  pushd ${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448
-  popd
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package(){
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch
deleted file mode 100644
index 602fe47f5..000000000
--- a/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
---- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:12:22.000000000 +0300
-+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:14:56.000000000 +0300
-@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run()
-     foreach( Meta::TrackPtr track, m_tracks )
-     {
-         //TODO replace with "avformat_open_input" since av_open_input_file is deprecated
--        if( av_open_input_file( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) )
-+        if( avformat_open_input( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) )
-         {
-             warning() << QLatin1String( "Unable to open input file: " ) + track->playableUrl().toLocalFile();
-             continue;
-@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run()
- }
- 
- 
--#include "MusicDNSAudioDecoder.moc"
-\ No newline at end of file
-+#include "MusicDNSAudioDecoder.moc"
diff --git a/testing/amarok/amarok.install b/testing/amarok/amarok.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/amarok/amarok.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/amarok/contextviewfix.patch b/testing/amarok/contextviewfix.patch
deleted file mode 100644
index 2363b623c..000000000
--- a/testing/amarok/contextviewfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-index a23305f..8fa6f9b 100644
---- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-+++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
-     if(!view())
-         return;
- 
--    QRectF rect = view()->sceneRect();
-+    // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895
-+    QRectF rect( view()->pos(), view()->maximumViewportSize() );
-     setGeometry( rect );
-     m_applets->setGeometry( rect );
-     m_applets->refresh();
\ No newline at end of file
diff --git a/testing/amarok/toolbarfix.patch b/testing/amarok/toolbarfix.patch
deleted file mode 100644
index ec012ca74..000000000
--- a/testing/amarok/toolbarfix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp	2012-01-29 20:20:01.901360205 +0100
-@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P
-     }
- }
- 
-+void Context::AppletToolbar::setContainment( Containment * containment )
-+{
-+    m_cont = containment;
-+}
-+
-+Context::Containment *
-+Context::AppletToolbar::containment() const
-+{
-+    return m_cont;
-+}
-+
- QSizeF
- Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
- {
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.h	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h	2012-01-29 20:17:52.414686784 +0100
-@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
-         
-         void appletRemoved( Plasma::Applet* applet );
- 
-+        void setContainment( Containment * containment );
-+        Containment* containment() const;
-+
-     signals:
-         void showApplet( Plasma::Applet* );
-         void appletAddedToToolbar( Plasma::Applet* applet, int loc );
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig
-diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp
---- amarok-2.5.0/src/context/ToolbarView.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/ToolbarView.cpp	2012-01-29 20:17:52.394686782 +0100
-@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
-     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
- 
-     // now we create the toolbar
--    m_toolbar = new AppletToolbar( containment );
-+    m_toolbar = new AppletToolbar(0);
-+    scene->addItem(m_toolbar.data());
-+    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
-     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
-     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
- 
-@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm
- 
- Context::ToolbarView::~ToolbarView()
- {
--
-+    delete m_toolbar.data();
- }
- 
- void
-Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig
diff --git a/testing/anjuta-extras/PKGBUILD b/testing/anjuta-extras/PKGBUILD
deleted file mode 100644
index 7789902d5..000000000
--- a/testing/anjuta-extras/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169278 2012-10-18 19:45:48Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=anjuta-extras
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('anjuta')
-makedepends=('intltool' 'gnome-doc-utils')
-install=anjuta-extras.install
-url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('69df64e6e13a6e0683ebaee5a26ee9b9368eda9ed157607d1e6935b52d7f0b9c')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $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 18dbfb6c4..000000000
--- a/testing/anjuta/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 169303 2012-10-18 23:51:08Z heftig $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Harley Laue <losinggeneration@yahoo.com>
-
-pkgbase=anjuta
-pkgname=('libanjuta' 'anjuta')
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
-url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('fd1e380f26bfdcf49661d6b8b2ab25eb3af44bca56aaa5f08c4d9af72cd9d98b')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package_libanjuta(){
-  pkgdesc="Anjuta runtime library"
-  depends=('gdl')
-  conflicts=('anjuta<3.4.4')
-
-  cd "$pkgbase-$pkgver/libanjuta"
-
-  # j1: Race during linking
-  make -j1 DESTDIR="$pkgdir" install
-}
-
-package_anjuta(){
-  pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
-
-  install=anjuta.install
-
-  cd "$pkgbase-$pkgver"
-  make -j1 DESTDIR="$pkgdir" install
-
-  cd libanjuta
-  make -j1 DESTDIR="$pkgdir" uninstall
-  
-  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 5608d35be..000000000
--- a/testing/anjuta/anjuta.install
+++ /dev/null
@@ -1,15 +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
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/asymptote/PKGBUILD b/testing/asymptote/PKGBUILD
deleted file mode 100644
index 42ebbfb05..000000000
--- a/testing/asymptote/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168270 2012-10-07 11:20:35Z remy $
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Firmicus <francois.archlinux.org>
-# Contributor: bender02 at gmx dot com
-
-pkgname=asymptote
-pkgver=2.20
-pkgrel=1
-pkgdesc="A vector graphics language (like metapost)"
-arch=('i686' 'x86_64')
-url="http://asymptote.sourceforge.net/"
-license=("GPL3")
-depends=('texlive-core' 'gc' 'freeglut' 'glu' 'gsl' 'fftw' 'libsigsegv')
-makedepends=('ghostscript' 'imagemagick')
-optdepends=('python2:           for the xasy GUI'
-            'python-imaging:    for the xasy GUI'
-            'tix:               for the xasy GUI')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
-install=texlive.install
-sha1sums=('4c86ab71cff57a592944303b11d9bb6ec34f1cbd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --enable-gc=/usr \
-              --prefix=/usr \
-              --with-latex=/usr/share/texmf/tex/latex \
-              --with-context=/usr/share/texmf/tex/context
-  make all
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check-all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install-all
-  sed -i -e 's@env python@env python2@' ${pkgdir}/usr/share/asymptote/GUI/*.py
-  # this dir contains png files that are already embedded in the pdf documentation:
-  rm -rf ${pkgdir}/usr/share/info/asymptote
-}
diff --git a/testing/asymptote/texlive.install b/testing/asymptote/texlive.install
deleted file mode 100644
index a7e61f209..000000000
--- a/testing/asymptote/texlive.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-
-post_install() {
-  install-info ${info_dir}/asy-faq.info.gz ${info_dir}/dir
-  echo ">>> updating the filename database for texlive..."
-  mktexlsr --quiet usr/share/texmf
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  install-info --delete ${info_dir}/asy-faq.info.gz ${info_dir}/dir
-}
-
-post_remove() {
-  echo ">>> updating the filename database for texlive..."
-  mktexlsr --quiet usr/share/texmf
-}
diff --git a/testing/at-spi2-atk/PKGBUILD b/testing/at-spi2-atk/PKGBUILD
deleted file mode 100644
index e685a89d8..000000000
--- a/testing/at-spi2-atk/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169276 2012-10-18 19:29:51Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-atk
-pkgver=2.6.1
-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')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0a796c3635b23d094d488ac3aeee1bd785debfde433640687d4b17dfeaeb3398')
-
-build() {
-  cd $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 $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 8318a2287..000000000
--- a/testing/at-spi2-core/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169275 2012-10-18 19:29:47Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-core
-pkgver=2.6.1
-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=('cb087f0a9191422bc3f44c562a0dbfdf1c2266e45c267070aeb63b874e00f867')
-
-build() {
-  cd $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 $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/at/PKGBUILD b/testing/at/PKGBUILD
deleted file mode 100644
index cae92b487..000000000
--- a/testing/at/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168098 2012-10-05 19:23:53Z eric $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Todd Musall <tmusall@comcast.net>
-
-pkgname=at
-pkgver=3.1.13
-pkgrel=2
-pkgdesc="AT and batch delayed command scheduling utility and daemon"
-arch=('i686' 'x86_64')
-url="http://packages.qa.debian.org/a/at.html"
-license=('GPL')
-depends=('pam')
-makedepends=('ssmtp')
-backup=('etc/at.deny')
-options=('!makeflags')
-source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz
-        atd atd.service)
-md5sums=('1da61af6c29e323abaaf13ee1a8dad79'
-         '35574e34829e7df07a3269d4ab646a29'
-         '33976a813f4fe7f5659354601044c6f8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man  \
-              --with-jobdir=/var/spool/atd \
-              --with-atspool=/var/spool/atd
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make IROOT="${pkgdir}" docdir=/usr/share/doc install
-  install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd"
-  install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service"
-}
diff --git a/testing/at/atd b/testing/at/atd
deleted file mode 100644
index d10a46a3b..000000000
--- a/testing/at/atd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/atd`
-case "$1" in
-  start)
-    stat_busy "Starting ATD Daemon"
-    [ -z "$PID" ] && /usr/sbin/atd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon atd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ATD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon atd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/at/atd.service b/testing/at/atd.service
deleted file mode 100644
index ba359878c..000000000
--- a/testing/at/atd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=ATD daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/atd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/atk/PKGBUILD b/testing/atk/PKGBUILD
deleted file mode 100644
index 25686b87c..000000000
--- a/testing/atk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169279 2012-10-18 19:45:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=atk
-pkgver=2.6.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=('eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD
deleted file mode 100644
index 4f540d839..000000000
--- a/testing/avidemux/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 163075 2012-07-06 16:17:06Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.6
-pkgrel=3
-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' 'libva')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
-
-build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  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' 'libva')
-  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')
-  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.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/avogadro/PKGBUILD b/testing/avogadro/PKGBUILD
deleted file mode 100644
index 9156d511d..000000000
--- a/testing/avogadro/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 163543 2012-07-15 13:16:32Z ibiru $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.0.3
-pkgrel=6
-pkgdesc="An advanced molecular editor based on Qt"
-arch=('i686' 'x86_64')
-url="http://avogadro.openmolecules.net/wiki/Main_Page"
-license=('GPL2')
-depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost')
-install=avogadro.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch'
-        'fix-opengl-headers.patch')
-md5sums=('92c2702c1980f70fb6d87a1a58147911'
-         'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec'
-         'f420bfd22e3d5d8fcddc625cf5e711f6')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
-  patch -p1 -i "${srcdir}"/fix-boost.patch
-  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/avogadro/avogadro.install b/testing/avogadro/avogadro.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/testing/avogadro/avogadro.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/avogadro/fix-boost.patch b/testing/avogadro/fix-boost.patch
deleted file mode 100644
index 8fb53ef12..000000000
--- a/testing/avogadro/fix-boost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
-+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
-@@ -149,7 +149,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
-+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
-@@ -11,7 +11,7 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
---- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
-+++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
-@@ -18,7 +18,7 @@
-   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
-   # We should probably scan the header to verify the Q_OBJECT macro is used
-   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
--  qt4_wrap_cpp(moc_files ${hdr_list})
-+  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-   # Now sort out the ui and qrc files, process them as appropriate
-   set(ui_plugin_files)
-   set(qrc_plugin_files)
diff --git a/testing/avogadro/fix-opengl-headers.patch b/testing/avogadro/fix-opengl-headers.patch
deleted file mode 100644
index e6e8bc3b5..000000000
--- a/testing/avogadro/fix-opengl-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
-+++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
-@@ -25,6 +25,8 @@
- #include "camera.h"
- #include "glwidget.h"
- #include <avogadro/molecule.h>
-+#include <Eigen/LU>
-+#include <GL/glu.h>
- 
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
-+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
-@@ -42,6 +42,7 @@
- #include <QColor>
- #include <QVarLengthArray>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
-+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
-@@ -70,6 +70,8 @@
- 
- #include <openbabel/mol.h>
- 
-+#include <GL/glu.h>
-+
- using namespace OpenBabel;
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
-+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
-@@ -36,6 +36,7 @@
- #include <QFile>
- #include <QDebug>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
-+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
-@@ -44,6 +44,8 @@
- #include <QComboBox>
- #include <QDebug>
- 
-+#include <GL/glu.h>
-+
- using namespace std;
- using namespace OpenBabel;
- using namespace Eigen;
diff --git a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
deleted file mode 100644
index 11f58a505..000000000
--- a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
-@@ -75,6 +75,42 @@
-   zmatrix.h
- )
- 
-+SET(libavogadro_MOC_HDRS
-+  animation.h
-+  atom.h
-+  bond.h
-+  color.h
-+  colorbutton.h
-+  colors/elementcolor.h
-+  cube.h
-+  elementdetail_p.h
-+  elementtranslator.h
-+  engine.h
-+  engines/bsdyengine.h
-+  extension.h
-+  fragment.h
-+  glwidget.h
-+  mesh.h
-+  molecule.h
-+  moleculefile.h
-+  moleculefile_p.h
-+  periodictablescene_p.h
-+  periodictableview.h
-+  plotwidget.h
-+  plugin.h
-+  pluginmanager.h
-+  primitive.h
-+  protein.h
-+  pythonengine_p.h
-+  pythonerror.h
-+  pythonextension_p.h
-+  pythontool_p.h
-+  residue.h
-+  tool.h
-+  toolgroup.h
-+  zmatrix.h
-+)
-+
- set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
- # Also add in the qtiocompressor class
- #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
-@@ -113,7 +148,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--qt4_automoc(${libavogadro_SRCS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
-@@ -149,7 +184,7 @@
-     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
- endforeach(headerFile ${libavogadro_HDRS})
- 
--add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
-+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
- target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
---- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
-@@ -224,5 +224,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "animation.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
---- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
-@@ -293,5 +293,3 @@
-    }
- 
-  } // End namespace Avogadro
--
--#include "atom.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
---- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
-@@ -166,5 +166,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "bond.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
---- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
-@@ -152,5 +152,3 @@
-     return "Generic Color";
-   }
- }
--
--#include "color.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
-@@ -94,5 +94,3 @@
-   }
- 
- } // end namespace
--
--#include "colorbutton.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
-@@ -63,7 +63,5 @@
- 
- }
- 
--#include "elementcolor.moc"
- //this is a static color plugin...
- //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
---- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
-@@ -322,5 +322,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "cube.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
-@@ -132,5 +132,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementdetail_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
-@@ -401,5 +401,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementtranslator.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
---- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
-@@ -377,5 +377,3 @@
-       return m_molecule->bonds();
-   }
- }
--
--#include "engine.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
-@@ -442,7 +442,5 @@
-   }
- 
- }
--
--#include "bsdyengine.moc"
- // This is a static engine...
- // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
---- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
-@@ -80,5 +80,3 @@
-   }
- 
- }
--
--#include "extension.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
---- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
-@@ -82,5 +82,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "fragment.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
-@@ -1966,5 +1966,3 @@
-     d->updateCache = true;
-   }
- }
--
--#include "glwidget.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
---- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
-@@ -231,5 +231,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "mesh.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
---- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
-@@ -1575,5 +1575,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "molecule.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
-@@ -22,23 +22,14 @@
-   02110-1301, USA.
-  **********************************************************************/
- 
--#include "moleculefile.h"
-+#include "moleculefile_p.h"
- 
- #include <avogadro/molecule.h>
- 
--#include <QFile>
- #include <QFileInfo>
--#include <QStringList>
--#include <QThread>
- #include <QDebug>
- #include <QPointer>
- 
--#include <openbabel/mol.h>
--#include <openbabel/obconversion.h>
--
--// Included in obconversion.h
--//#include <iostream>
--
- namespace Avogadro {
- 
-   using OpenBabel::OBConversion;
-@@ -578,164 +569,6 @@
-     return false;
-   }
- 
--  class ReadFileThread : public QThread
--  {
--    //    Q_OBJECT 
--
--    public:
--      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
--      {
--      }
--      
--      void addConformer(const OpenBabel::OBMol &conformer)
--      {
--        unsigned int numAtoms = conformer.NumAtoms();
--        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
--        for (unsigned int i = 0; i < numAtoms; ++i)
--          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
--        m_moleculeFile->m_conformers.push_back(coords);
--      }
--
--      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
--      {
--        if (!c) {
--          // this is the first molecule read
--          m_moleculeFile->setConformerFile(true);
--          addConformer(current);
--          return;
--        }
--
--        if (!m_moleculeFile->isConformerFile())
--          return;
--
--        // as long as we are not sure if this really is a 
--        // conformer/trajectory file, add the conformers
--        addConformer(current);
--
--        // performance: check only certain molecule 1-10,20,50
--        switch (c) {
--          case 1:
--          case 2:
--          case 3:
--          case 4:
--          case 5:
--          case 6:
--          case 7:
--          case 8:
--          case 9:
--          case 10:
--          case 20:
--          case 50:
--            break;
--          default:
--            return;
--        }
--
--        if (first.NumAtoms() != current.NumAtoms()) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--          return;
--        }
--
--        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
--          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
--          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
--          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
--            m_moleculeFile->setConformerFile(false);
--            m_moleculeFile->m_conformers.clear();
--            return;
--          }    
--        }
--      }
--
--      void run()
--      {
--        // Check that the file can be read from disk
--        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
--          // Cannot read the file
--          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
--                                         .arg(m_moleculeFile->m_fileName));
--          return;
--        }
-- 
--        // Construct the OpenBabel objects, set the file type
--        OpenBabel::OBConversion conv;
--        OpenBabel::OBFormat *inFormat;
--        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
--          // Input format not supported
--          m_moleculeFile->m_error.append(
--              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
--          return;
--        } else {
--          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
--          if (!inFormat || !conv.SetInFormat(inFormat)) {
--            // Input format not supported
--            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
--                                           .arg(m_moleculeFile->m_fileName));
--            return;
--          }
--        }
--
--        // set any options
--        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
--          foreach(const QString &option,
--              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
--            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
--          }
--        }
--
--        // Now attempt to read the molecule in
--        ifstream ifs;
--        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
--        if (!ifs) // Should not happen, already checked file could be opened
--          return;
--      
--        // read all molecules
--        OpenBabel::OBMol firstOBMol, currentOBMol;
--        unsigned int c = 0;
--        conv.SetInStream(&ifs);
--        m_moleculeFile->streamposRef().push_back(ifs.tellg());
--        while (ifs.good() && conv.Read(&currentOBMol)) {
--          if (!c)
--            firstOBMol = currentOBMol;
--
--          if (c > 20 && !m_moleculeFile->isConformerFile())
--            m_moleculeFile->setFirstReady(true);
--
--          // detect conformer/trajectory files
--          detectConformers(c, firstOBMol, currentOBMol);
--          // store information about molecule
--          m_moleculeFile->streamposRef().push_back(ifs.tellg());
--          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
--          // increment count
--          ++c;
--        }
--        m_moleculeFile->streamposRef().pop_back();
--
--        // signle molecule files are not conformer files
--        if (c == 1) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--        }
--
--        // check for empty titles
--        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
--          if (!m_moleculeFile->titlesRef()[i].isEmpty())
--            continue;
--
--          QString title;
--          if (m_moleculeFile->isConformerFile())
--            title = tr("Conformer %1").arg(i+1);
--          else
--            title = tr("Molecule %1").arg(i+1);
--        
--          m_moleculeFile->titlesRef()[i] = title;
--        }
--      }
--
--      MoleculeFile *m_moleculeFile;
--  }; // end ReadFileThread class
--
-   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
-       const QString &fileType, const QString &fileOptions, bool wait)
-   {
-@@ -794,6 +627,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "moleculefile.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
-@@ -0,0 +1,202 @@
-+/**********************************************************************
-+  MoleculeFile - Class representing molecule file.
-+
-+  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
-+
-+  This file is part of the Avogadro molecular editor project.
-+  For more information, see <http://avogadro.openmolecules.net/>
-+
-+  Avogadro 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.
-+
-+  Avogadro is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+  02110-1301, USA.
-+ **********************************************************************/
-+
-+#ifndef MOLECULEFILE_P_H
-+#define MOLECULEFILE_P_H
-+
-+#include "moleculefile.h"
-+
-+#include <openbabel/mol.h>
-+#include <openbabel/obconversion.h>
-+
-+#include <QFile>
-+#include <QStringList>
-+#include <QThread>
-+
-+namespace Avogadro {
-+
-+  using OpenBabel::OBConversion;
-+  using std::ifstream;
-+
-+class ReadFileThread : public QThread
-+{
-+      Q_OBJECT
-+
-+  public:
-+    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
-+    {
-+    }
-+
-+    void addConformer(const OpenBabel::OBMol &conformer)
-+    {
-+      unsigned int numAtoms = conformer.NumAtoms();
-+      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
-+      for (unsigned int i = 0; i < numAtoms; ++i)
-+        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
-+      m_moleculeFile->m_conformers.push_back(coords);
-+    }
-+
-+    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
-+    {
-+      if (!c) {
-+        // this is the first molecule read
-+        m_moleculeFile->setConformerFile(true);
-+        addConformer(current);
-+        return;
-+      }
-+
-+      if (!m_moleculeFile->isConformerFile())
-+        return;
-+
-+      // as long as we are not sure if this really is a
-+      // conformer/trajectory file, add the conformers
-+      addConformer(current);
-+
-+      // performance: check only certain molecule 1-10,20,50
-+      switch (c) {
-+        case 1:
-+        case 2:
-+        case 3:
-+        case 4:
-+        case 5:
-+        case 6:
-+        case 7:
-+        case 8:
-+        case 9:
-+        case 10:
-+        case 20:
-+        case 50:
-+          break;
-+        default:
-+          return;
-+      }
-+
-+      if (first.NumAtoms() != current.NumAtoms()) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+        return;
-+      }
-+
-+      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
-+        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
-+        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
-+        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
-+          m_moleculeFile->setConformerFile(false);
-+          m_moleculeFile->m_conformers.clear();
-+          return;
-+        }
-+      }
-+    }
-+
-+    void run()
-+    {
-+      // Check that the file can be read from disk
-+      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
-+        // Cannot read the file
-+        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
-+                                       .arg(m_moleculeFile->m_fileName));
-+        return;
-+      }
-+
-+      // Construct the OpenBabel objects, set the file type
-+      OpenBabel::OBConversion conv;
-+      OpenBabel::OBFormat *inFormat;
-+      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
-+        // Input format not supported
-+        m_moleculeFile->m_error.append(
-+            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
-+        return;
-+      } else {
-+        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
-+        if (!inFormat || !conv.SetInFormat(inFormat)) {
-+          // Input format not supported
-+          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
-+                                         .arg(m_moleculeFile->m_fileName));
-+          return;
-+        }
-+      }
-+
-+      // set any options
-+      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
-+        foreach(const QString &option,
-+            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
-+          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
-+        }
-+      }
-+
-+      // Now attempt to read the molecule in
-+      ifstream ifs;
-+      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
-+      if (!ifs) // Should not happen, already checked file could be opened
-+        return;
-+
-+      // read all molecules
-+      OpenBabel::OBMol firstOBMol, currentOBMol;
-+      unsigned int c = 0;
-+      conv.SetInStream(&ifs);
-+      m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+      while (ifs.good() && conv.Read(&currentOBMol)) {
-+        if (!c)
-+          firstOBMol = currentOBMol;
-+
-+        if (c > 20 && !m_moleculeFile->isConformerFile())
-+          m_moleculeFile->setFirstReady(true);
-+
-+        // detect conformer/trajectory files
-+        detectConformers(c, firstOBMol, currentOBMol);
-+        // store information about molecule
-+        m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
-+        // increment count
-+        ++c;
-+      }
-+      m_moleculeFile->streamposRef().pop_back();
-+
-+      // signle molecule files are not conformer files
-+      if (c == 1) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+      }
-+
-+      // check for empty titles
-+      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
-+        if (!m_moleculeFile->titlesRef()[i].isEmpty())
-+          continue;
-+
-+        QString title;
-+        if (m_moleculeFile->isConformerFile())
-+          title = tr("Conformer %1").arg(i+1);
-+        else
-+          title = tr("Molecule %1").arg(i+1);
-+
-+        m_moleculeFile->titlesRef()[i] = title;
-+      }
-+    }
-+
-+    MoleculeFile *m_moleculeFile;
-+};
-+
-+} // end namespace Avogadro
-+
-+#endif // MOLECULEFILE_P_H
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
-@@ -213,5 +213,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "periodictablescene_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
-@@ -69,4 +69,3 @@
- 
- } // End namespace Avogadro
- 
--#include "periodictableview.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
-@@ -27,7 +27,6 @@
-  **********************************************************************/
- 
- #include "plotwidget.h"
--#include "plotwidget.moc"
- 
- #include <math.h>
- #include <QDebug>
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
---- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
-@@ -65,5 +65,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "plugin.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
-@@ -784,5 +784,3 @@
-   }
- 
- }
--
--#include "pluginmanager.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
---- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
-@@ -77,5 +77,3 @@
-   }
- 
- }
--
--#include "primitive.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
---- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
-@@ -978,5 +978,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "protein.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
-@@ -11,9 +11,9 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--qt4_automoc(moleculelist.cpp)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
- 
--ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
-+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
- SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
- if (WIN32)
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
-@@ -70,4 +70,3 @@
- 
- }
- 
--#include "moleculelist.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
-@@ -289,5 +289,3 @@
- 
- 
- }
--
--#include "pythonengine_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
-@@ -112,4 +112,3 @@
- 
- } // namespace
- 
--#include "pythonerror.moc"
-
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
-@@ -340,5 +340,3 @@
-   }
- 
- }
--
--#include "pythonextension_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
-@@ -344,5 +344,3 @@
-   }
- 
- }
--
--#include "pythontool_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
---- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
-@@ -160,6 +160,3 @@
-   }
- 
- } // End namespace Avogadro
--
-- #include "residue.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
---- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
-@@ -117,5 +117,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "tool.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
-@@ -206,5 +206,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "toolgroup.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
-@@ -149,5 +149,3 @@
- 
- 
- } // End namespace Avogadro
--
--#include "zmatrix.moc"
diff --git a/testing/banshee/PKGBUILD b/testing/banshee/PKGBUILD
deleted file mode 100644
index 0cce416cd..000000000
--- a/testing/banshee/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=banshee
-pkgver=2.6.0
-pkgrel=1
-pkgdesc="Music management and playback for GNOME"
-arch=('i686' 'x86_64')
-url="http://banshee.fm/"
-license=('MIT')
-depends=(libxxf86vm gst-plugins-base mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info gst-plugins-bad mono-upnp)
-makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common')
-optdepends=('gst-plugins-good: Extra media codecs'
-            'gst-plugins-ugly: Extra media codecs'
-            'gst-libav: Extra media codecs'
-            'brasero: CD burning')
-options=('!libtool')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz
-        gst-1.0.patch)
-sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a'
-            'eddf696b0be91331fae8d63c23277a355e94539a3436a8619dab2d732b30234e')
-
-build() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  #https://bugzilla.gnome.org/show_bug.cgi?id=679433
-  patch -Np1 -i "${srcdir}/gst-1.0.patch"
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-docs \
-              --disable-static \
-              --disable-scrollkeeper \
-              --disable-schemas-install \
-              --with-vendor-build-id=ArchLinux
-  make
-}
-
-package() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/testing/banshee/banshee-recent-gpod.patch b/testing/banshee/banshee-recent-gpod.patch
deleted file mode 100644
index afb3a0fd1..000000000
--- a/testing/banshee/banshee-recent-gpod.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d4cd959c4a48ffc9da8fe0983bd31c4647669bf4 Mon Sep 17 00:00:00 2001
-From: William Witt <william@witt-family.net>
-Date: Sat, 30 Jul 2011 21:54:41 -0500
-Subject: [PATCH] - Changed typecast on FileSize to uint in AppleDeviceTrackInfo to comply with libgpod-sharp
-
----
- .../AppleDeviceTrackInfo.cs                        |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-index 178266d..b8549f7 100644
---- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice
-             track.CDs = DiscCount;
-             track.CDNumber = DiscNumber;
-             track.TrackLength = (int) Duration.TotalMilliseconds;
--            track.Size = (int)FileSize;
-+            track.Size = (uint)FileSize;
-             track.Grouping = Grouping;
-             try {
-                 track.TimePlayed = LastPlayed;
--- 
-1.7.3.4
diff --git a/testing/banshee/banshee.install b/testing/banshee/banshee.install
deleted file mode 100644
index 1d0fd332b..000000000
--- a/testing/banshee/banshee.install
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgname=banshee
-
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/banshee/gst-1.0.patch b/testing/banshee/gst-1.0.patch
deleted file mode 100644
index f8fa7a7c2..000000000
--- a/testing/banshee/gst-1.0.patch
+++ /dev/null
@@ -1,1025 +0,0 @@
-From ec14625f10c26ae3646f382ffd804ee28c3d7334 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Wed, 19 Sep 2012 11:34:06 +0200
-Subject: [PATCH] Initial port to GStreamer 1.0
-
----
- build/m4/banshee/gstreamer.m4                |   19 +++---
- data/audio-profiles/wav.xml.in               |    5 +-
- libbanshee/banshee-bpmdetector.c             |   11 ++--
- libbanshee/banshee-gst.h                     |    4 +-
- libbanshee/banshee-player-cdda.c             |    5 +-
- libbanshee/banshee-player-dvd.c              |    4 +-
- libbanshee/banshee-player-equalizer.c        |    4 +-
- libbanshee/banshee-player-missing-elements.c |    2 +-
- libbanshee/banshee-player-pipeline.c         |   37 ++++++-----
- libbanshee/banshee-player-private.h          |   13 ++--
- libbanshee/banshee-player-replaygain.c       |   29 ++++-----
- libbanshee/banshee-player-video.c            |   89 +++++++++++++-------------
- libbanshee/banshee-player-vis.c              |   88 ++++++++-----------------
- libbanshee/banshee-player.c                  |   11 ++--
- libbanshee/banshee-ripper.c                  |   16 ++---
- libbanshee/banshee-tagger.c                  |    2 +-
- libbanshee/banshee-transcoder.c              |   19 +++---
- 17 files changed, 156 insertions(+), 202 deletions(-)
-
-diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
-index 6267cce..917cf58 100644
---- a/build/m4/banshee/gstreamer.m4
-+++ b/build/m4/banshee/gstreamer.m4
-@@ -1,17 +1,18 @@
- AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
- [
--	GSTREAMER_REQUIRED_VERSION=0.10.26
-+	GSTREAMER_REQUIRED_VERSION=0.11.99
- 	AC_SUBST(GSTREAMER_REQUIRED_VERSION)
- 
- 	PKG_CHECK_MODULES(GST,
--		gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
--
--	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
-+		gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION)
- 
- 	AC_SUBST(GST_CFLAGS)
- 	AC_SUBST(GST_LIBS)
-diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in
-index 35cd1d2..6dc1bab 100644
---- a/data/audio-profiles/wav.xml.in
-+++ b/data/audio-profiles/wav.xml.in
-@@ -14,10 +14,7 @@
-                 "audioresample"
-                 "audioconvert" 
-                 (+ "audio/x-raw-int, "
--                   "endianness=(int)1234, "
--                   "width=(int)16, "
--                   "depth=(int)16, "
--                   "signed=(boolean)true, "
-+                   "format=(string)S16LE, "
-                    "rate=(int)44100, "
-                    "channels=(int)2" )
-                 "wavenc")
-diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c
-index c06ffcb..68b0419 100644
---- a/libbanshee/banshee-bpmdetector.c
-+++ b/libbanshee/banshee-bpmdetector.c
-@@ -30,6 +30,7 @@
- #  include "config.h"
- #endif
- 
-+#include <stdio.h>
- #include <string.h>
- #include <glib/gi18n.h>
- 
-@@ -50,7 +51,7 @@ struct BansheeBpmDetector {
- 
-     /*
-      * You can run this pipeline on the cmd line with:
--     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \
-+     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \
-      *    audioconvert ! bpmdetect ! fakesink
-      */
- 
-@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad,
- 
-     g_return_if_fail(detector != NULL);
- 
--    audiopad = gst_element_get_pad(detector->audioconvert, "sink");
-+    audiopad = gst_element_get_static_pad(detector->audioconvert, "sink");
-     
-     if(GST_PAD_IS_LINKED(audiopad)) {
-         g_object_unref(audiopad);
-         return;
-     }
- 
--    caps = gst_pad_get_caps(pad);
-+    caps = gst_pad_query_caps(pad, NULL);
-     str = gst_caps_get_structure(caps, 0);
-     
-     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
-@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector)
-         return FALSE;
-     }
-   
--    detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2");
-+    detector->decodebin = gst_element_factory_make ("decodebin", "decodebin");
-     if (detector->decodebin == NULL) {
--        bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL);
-+        bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL);
-         return FALSE;
-     }
- 
-diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h
-index 85662cf..332f356 100644
---- a/libbanshee/banshee-gst.h
-+++ b/libbanshee/banshee-gst.h
-@@ -41,9 +41,11 @@
- #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \
-     gboolean iter##_done = FALSE; \
-     while (!iter##_done) { \
-+        GValue child_value = {0, }; \
-         child_type child_name; \
--        switch (gst_iterator_next (iter, (gpointer)&child_name)) { \
-+        switch (gst_iterator_next (iter, &child_value)) { \
-             case GST_ITERATOR_OK: { \
-+                child_name = (child_type) g_value_get_object(&child_value); \
-                 { block; } \
-                 break; \
-             } \
-diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c
-index 8be2bdd..401edf0 100644
---- a/libbanshee/banshee-player-cdda.c
-+++ b/libbanshee/banshee-player-cdda.c
-@@ -28,7 +28,8 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
--#include <gst/cdda/gstcddabasesrc.h>
-+#include <stdlib.h>
-+#include <gst/audio/gstaudiocdsrc.h>
- #include "banshee-player-cdda.h"
- 
- // ---------------------------------------------------------------------------
-@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin)
-     
-     g_object_get (playbin, "source", &source, NULL);
-     
--    if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) {
-+    if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) {
-         if (source != NULL) {
-             g_object_unref (source);
-         }
-diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c
-index 55d499c..991b506 100644
---- a/libbanshee/banshee-player-dvd.c
-+++ b/libbanshee/banshee-player-dvd.c
-@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player)
- {
-     gint64 index;
-     GstFormat format = gst_format_get_by_nick ("chapter");
--    gst_element_query_position (player->playbin, &format, &index);
-+    gst_element_query_position (player->playbin, format, &index);
-     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
-         GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0);
- }
-@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player)
- {
-     gint64 index;
-     GstFormat format = gst_format_get_by_nick ("chapter");
--    gst_element_query_position (player->playbin, &format, &index);
-+    gst_element_query_position (player->playbin, format, &index);
-     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
-         GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0);
- }
-diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c
-index a496ada..0cbb3b7 100644
---- a/libbanshee/banshee-player-equalizer.c
-+++ b/libbanshee/banshee-player-equalizer.c
-@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain)
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     
-     if (player->equalizer != NULL) {
--        GstObject *band;
-+        GObject *band;
- 
-         g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)));
- 
-@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq)
-     count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer));
-     
-     for (i = 0; i < count; i++) {
--        GstObject *band;
-+        GObject *band;
-         
-         band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i);
-         g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL);
-diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
-index 20804c4..30118c5 100644
---- a/libbanshee/banshee-player-missing-elements.c
-+++ b/libbanshee/banshee-player-missing-elements.c
-@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
-     }
-     #endif
-     
--    install_return = gst_install_plugins_async (details, player->install_plugins_context, 
-+    install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, 
-         bp_missing_elements_handle_install_result, player);
-     
-     if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) {
-diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index ed845f3..6c2af35 100644
---- a/libbanshee/banshee-player-pipeline.c
-+++ b/libbanshee/banshee-player-pipeline.c
-@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player)
-     GstMessage *msg;
- 
-     // We're being called from the streaming thread, so don't do anything here
--    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL));
-+    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed"));
-     gst_element_post_message (player->playbin, msg);
- }
- 
-@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
-             break;
-         }
- 
-+        case GST_MESSAGE_STREAM_START: {
-+            bp_next_track_starting (player);
-+            break;
-+        }
-+
-         case GST_MESSAGE_APPLICATION: {
-             const gchar * name;
-             const GstStructure * s = gst_message_get_structure (message);
-@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player)
-     
-     // Playbin is the core element that handles autoplugging (finding the right
-     // source and decoder elements) based on source URI and stream content
--    player->playbin = gst_element_factory_make ("playbin2", "playbin");
-+    player->playbin = gst_element_factory_make ("playbin", "playbin");
- 
- #ifdef ENABLE_GAPLESS
-     // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback.
--    // This can be removed once playbin2 generates its own next-track signal.
-+    // This can be removed once playbin generates its own next-track signal.
-     // bgo#584987 - this is included in >= 0.10.26
-     g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player);
- #endif //ENABLE_GAPLESS
-@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player)
-     g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player);
-     g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player);
- 
--    // Try to find an audio sink, prefer gconf, which typically is set to auto these days,
--    // fall back on auto, which should work on windows, and as a last ditch, try alsa
--    audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink");
--    if (audiosink == NULL) {
--        audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
--        if (audiosink != NULL) {
--            g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
--        } else {
--            audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
--            if (audiosink == NULL) {
--                audiosink = gst_element_factory_make ("alsasink", "audiosink");
--            }
-+    audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
-+    if (audiosink != NULL) {
-+        g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
-+    } else {
-+        audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
-+        if (audiosink == NULL) {
-+            audiosink = gst_element_factory_make ("alsasink", "audiosink");
-         }
-     }
-     
-@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player)
-         GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink));
-         BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, {
-             player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL;
--            gst_object_unref (element);
-         });
-     }
-     bp_debug ("Audiosink has volume: %s",
-@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player)
-     }
-    
-     // Ghost pad the audio bin so audio is passed from the bin into the tee
--    teepad = gst_element_get_pad (player->audiotee, "sink");
-+    teepad = gst_element_get_static_pad (player->audiotee, "sink");
-     gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad));
-     gst_object_unref (teepad);
- 
-@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player)
-     gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
- 
-     // Link the first tee pad to the primary audio sink queue
--    GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink");
--    pad = gst_element_get_request_pad (player->audiotee, "src%d");
-+    GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink");
-+    pad = gst_element_get_request_pad (player->audiotee, "src_%u");
-     g_object_set(player->audiotee, "alloc-pad", pad, NULL);
-     gst_pad_link (pad, sinkpad);
-     gst_object_unref (GST_OBJECT (pad));
-diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h
-index 9fed356..9346911 100644
---- a/libbanshee/banshee-player-private.h
-+++ b/libbanshee/banshee-player-private.h
-@@ -42,14 +42,14 @@
- #include <gst/fft/gstfftf32.h>
- #include <gst/pbutils/pbutils.h>
- #include <gst/tag/tag.h>
--#include <gst/interfaces/navigation.h>
-+#include <gst/video/navigation.h>
- 
- #if defined(GDK_WINDOWING_X11)
- #  include <gdk/gdkx.h>
--#  include <gst/interfaces/xoverlay.h>
-+#  include <gst/video/videooverlay.h>
- #elif defined(GDK_WINDOWING_WIN32)
- #  include <gdk/gdkwin32.h>
--#  include <gst/interfaces/xoverlay.h>
-+#  include <gst/video/videooverlay.h>
- #endif
- 
- #include "banshee-gst.h"
-@@ -155,11 +155,11 @@ struct BansheePlayer {
-     // Video State
-     BpVideoDisplayContextType video_display_context_type;
-     #if defined(GDK_WINDOWING_X11)
--    GstXOverlay *xoverlay;
-+    GstVideoOverlay *video_overlay;
-     GdkWindow *video_window;
-     XID video_window_xid;
-     #elif defined(GDK_WINDOWING_WIN32)
--    GstXOverlay *xoverlay;
-+    GstVideoOverlay *video_overlay;
-     GdkWindow *video_window;
-     HWND video_window_xid;
-     #endif
-@@ -179,6 +179,8 @@ struct BansheePlayer {
-     GstFFTF32 *vis_fft;
-     GstFFTF32Complex *vis_fft_buffer;
-     gfloat *vis_fft_sample_buffer;
-+    GstPad *vis_event_probe_pad;
-+    gulong vis_event_probe_id;
-     
-     // Plugin Installer State
-     GdkWindow *window;
-@@ -197,6 +199,7 @@ struct BansheePlayer {
-     // http://replaygain.hydrogenaudio.org/player_scale.html
-     gdouble rg_gain_history[10];
-     gint history_size;
-+    gulong rg_pad_block_id;
- 
-     //dvd navigation
-     GstNavigation *navigation;
-diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c
-index a479d4a..e42b197 100644
---- a/libbanshee/banshee-player-replaygain.c
-+++ b/libbanshee/banshee-player-replaygain.c
-@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban
-     _bp_rgvolume_print_volume (player);
- }
- 
--static void
--pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-+static GstPadProbeReturn
-+pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data)
- {
-     BansheePlayer* player;
- 
--    if (!blocked) {
--        return;
--    }
--
-     player = (BansheePlayer*) user_data;
--    g_return_if_fail (IS_BANSHEE_PLAYER (player));
-+    g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK);
- 
-     // The pad_block_cb can get triggered multiple times, on different threads.
-     // Lock around the link/unlink code, so we don't end up going through here
-@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-     if ((player->replaygain_enabled && player->rgvolume_in_pipeline) ||
-         (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) {
-         // The pipeline is already in the correct state.  Unblock the pad, and return.
-+        player->rg_pad_block_id = 0;
-         g_mutex_unlock (player->replaygain_mutex);
--        if (gst_pad_is_blocked (srcPad)) {
--            gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
--        }
--        return;
-+        return GST_PAD_PROBE_REMOVE;
-     }
- 
-     if (player->rgvolume_in_pipeline) {
-@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-     }
- 
-     // Our state is now consistent
-+    player->rg_pad_block_id = 0;
-     g_mutex_unlock (player->replaygain_mutex);
- 
--    if (gst_pad_is_blocked (srcPad)) {
--        gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
--    }
--
-     _bp_rgvolume_print_volume (player);
-+
-+    return GST_PAD_PROBE_REMOVE;
- }
- 
- // ---------------------------------------------------------------------------
-@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player)
-     srcPad = gst_element_get_static_pad (player->before_rgvolume, "src");
- 
-     if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) {
--        gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player);
--    } else if (srcPad->block_callback == NULL) {
--        pad_block_cb (srcPad, TRUE, player);
-+        player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL);
-+    } else if (!player->rg_pad_block_id) {
-+        pad_block_cb (srcPad, NULL, player);
-     }
- }
- 
-diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c
-index b901354..eb95c3f 100644
---- a/libbanshee/banshee-player-video.c
-+++ b/libbanshee/banshee-player-video.c
-@@ -37,54 +37,54 @@
- #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
- 
- static gboolean
--bp_video_find_xoverlay (BansheePlayer *player)
-+bp_video_find_video_overlay (BansheePlayer *player)
- {
-     GstElement *video_sink = NULL;
--    GstElement *xoverlay;
--    GstXOverlay *previous_xoverlay;
--    gboolean    found_xoverlay;
-+    GstElement *video_overlay;
-+    GstVideoOverlay *previous_video_overlay;
-+    gboolean    found_video_overlay;
- 
-     g_object_get (player->playbin, "video-sink", &video_sink, NULL);
- 
-     g_mutex_lock (player->video_mutex);
--    previous_xoverlay = player->xoverlay;
-+    previous_video_overlay = player->video_overlay;
- 
-     if (video_sink == NULL) {
--        player->xoverlay = NULL;
--        if (previous_xoverlay != NULL) {
--            gst_object_unref (previous_xoverlay);
-+        player->video_overlay = NULL;
-+        if (previous_video_overlay != NULL) {
-+            gst_object_unref (previous_video_overlay);
-         }
-         g_mutex_unlock (player->video_mutex);
-         return FALSE;
-     }
-    
--    xoverlay = GST_IS_BIN (video_sink)
--        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY)
-+    video_overlay = GST_IS_BIN (video_sink)
-+        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY)
-         : video_sink;
-     
--    player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL;
-+    player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL;
-     
--    if (previous_xoverlay != NULL) {
--        gst_object_unref (previous_xoverlay);
-+    if (previous_video_overlay != NULL) {
-+        gst_object_unref (previous_video_overlay);
-     }
-         
- #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink
--    if (player->xoverlay != NULL && g_object_class_find_property (
--        G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) {
--        g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL);
-+    if (player->video_overlay != NULL && g_object_class_find_property (
-+        G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) {
-+        g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL);
-     }
- #endif
-     
--    if (player->xoverlay != NULL && g_object_class_find_property (
--        G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) {
--        g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL);
-+    if (player->video_overlay != NULL && g_object_class_find_property (
-+        G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) {
-+        g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL);
-     }
- 
-     gst_object_unref (video_sink);
--    found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE;
-+    found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE;
- 
-     g_mutex_unlock (player->video_mutex);
--    return found_xoverlay;
-+    return found_video_overlay;
- }
- 
- #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */
-@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
- 
-     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
--    bp_video_find_xoverlay (player);
-+    bp_video_find_video_overlay (player);
-     #endif
- }
- 
- static void
- bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player)
- {
--    gboolean found_xoverlay;
-+    gboolean found_video_overlay;
-     
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
- 
-     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
- 
--    if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) {
-+    if (!gst_is_video_overlay_prepare_window_handle_message (message)) {
-         return;
-     }
- 
--    found_xoverlay = bp_video_find_xoverlay (player);
-+    found_video_overlay = bp_video_find_video_overlay (player);
- 
--    if (found_xoverlay) {
--        gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
-+    if (found_video_overlay) {
-+        gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
-     }
- 
-     #endif
-@@ -164,7 +164,7 @@ static void
- cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p)
- {
-     GstStructure * s = NULL;
--    GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj));
-+    GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj));
- 
-     if (G_UNLIKELY (!caps)) {
-         return;
-@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player)
-     }
- 
-     if (G_LIKELY (vpad)) {
--        GstCaps *caps = gst_pad_get_negotiated_caps (vpad);
-+        GstCaps *caps = gst_pad_get_current_caps (vpad);
-         if (G_LIKELY (caps)) {
-             cb_caps_set (G_OBJECT (vpad), NULL, player);
-             gst_caps_unref (caps);
-@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus)
- 
-     player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW;
-     
--    videosink = gst_element_factory_make ("gconfvideosink", "videosink");
-+    videosink = gst_element_factory_make ("autovideosink", "videosink");
-     if (videosink == NULL) {
--        videosink = gst_element_factory_make ("autovideosink", "videosink");
--        if (videosink == NULL) {
--            player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
--            videosink = gst_element_factory_make ("fakesink", "videosink");
--            if (videosink != NULL) {
--                g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
--            }
-+        player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
-+        videosink = gst_element_factory_make ("fakesink", "videosink");
-+        if (videosink != NULL) {
-+            g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
-         }
-     }
-     
-     g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL);
-     
--    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player);
-+    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL);
-     g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player);
-         
-     if (GST_IS_BIN (videosink)) {
-@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc
- {
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     
--    if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) {
--        gst_x_overlay_expose (player->xoverlay);
-+    if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) {
-+        gst_video_overlay_expose (player->video_overlay);
-         return;
-     }
- 
--    if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) {
-+    if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) {
-         return;
-     }
-     
--    gst_object_ref (player->xoverlay);
-+    gst_object_ref (player->video_overlay);
- 
--    gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
--    gst_x_overlay_expose (player->xoverlay);
-+    gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
-+    gst_video_overlay_expose (player->video_overlay);
- 
--    gst_object_unref (player->xoverlay);
-+    gst_object_unref (player->video_overlay);
- }
- 
- // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing.
-@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window)
- //    //Explicitly create the native window.  GDK_WINDOW_XWINDOW will call this
- //    //function anyway, but this way we can raise a more useful message should it fail.
- //    if (!gdk_window_ensure_native (window)) {
--//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!");
-+//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!");
- //    }
- //#endif
- 
-diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c
-index 5787c87..7e7dc78 100644
---- a/libbanshee/banshee-player-vis.c
-+++ b/libbanshee/banshee-player-vis.c
-@@ -27,17 +27,17 @@
- //
- 
- #include <math.h>
-+#include <gst/audio/audio.h>
- 
- #include "banshee-player-vis.h"
- 
- #define SLICE_SIZE 735
- 
- static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS (
--    "audio/x-raw-float, "
-+    "audio/x-raw, "
-+    "format = (string) " GST_AUDIO_NE(F32) ", "
-     "rate = (int) 44100, "
--    "channels = (int) 2, "
--    "endianness = (int) BYTE_ORDER, "
--    "width = (int) 32"
-+    "channels = (int) 2"
- );
- 
- // ---------------------------------------------------------------------------
-@@ -48,6 +48,7 @@ static void
- bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata)
- {
-     BansheePlayer *player = (BansheePlayer*)userdata;
-+    GstCaps *caps;
-     GstStructure *structure;
-     gint channels, wanted_size;
-     gfloat *data;
-@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
-         player->vis_thawing = FALSE;
-     }
-     
--    structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0);
-+    caps = gst_pad_get_current_caps (pad);
-+    structure = gst_caps_get_structure (caps, 0);
-     gst_structure_get_int (structure, "channels", &channels);
-+    gst_caps_unref (caps);
-     
-     wanted_size = channels * SLICE_SIZE * sizeof (gfloat);
- 
--    gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer));
-+    gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer));
-     
--    while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) {
-+    while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) {
-         gfloat *deinterlaced = g_malloc (wanted_size);
-         gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2);
- 
-@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
-         g_free (deinterlaced);
-         g_free (specbuf);
- 
-+        gst_adapter_unmap (player->vis_buffer);
-         gst_adapter_flush (player->vis_buffer, wanted_size);
-     }
- }
-@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
- // Internal Functions
- // ---------------------------------------------------------------------------
- 
--static void
--_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data)
-+static GstPadProbeReturn
-+_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data)
- {
-     BansheePlayer *player = (BansheePlayer *) data;
-+    GstEvent *event;
- 
--    if (!blocked) {
--        // Set thawing mode (discards buffers that are too old from the queue).
--        player->vis_thawing = TRUE;
--    }
--}
--
--static void
--_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked)
--{
--    GstPad *queue_sink;
--
--    if (player->vis_resampler == NULL)
--        return;
--
--    queue_sink = gst_element_get_static_pad (player->vis_resampler, "src");
--
--    gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player);
--
--    gst_object_unref (GST_OBJECT (queue_sink));
--}
--
--static gboolean
--_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data)
--{
--    BansheePlayer *player = (BansheePlayer *) data;
-+    if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0)
-+        return GST_PAD_PROBE_PASS;
- 
-+    event = GST_EVENT (info->data);
-     switch (GST_EVENT_TYPE (event)) {
-         case GST_EVENT_FLUSH_START:
-         case GST_EVENT_FLUSH_STOP:
-         case GST_EVENT_SEEK:
--        case GST_EVENT_NEWSEGMENT:
-+        case GST_EVENT_SEGMENT:
-         case GST_EVENT_CUSTOM_DOWNSTREAM:
-             player->vis_thawing = TRUE;
- 
-         default: break;
-     }
- 
--    if (player->vis_enabled)
--        return TRUE;
--
--    switch (GST_EVENT_TYPE (event)) {
--    case GST_EVENT_EOS:
--    case GST_EVENT_CUSTOM_DOWNSTREAM_OOB:
--        _bp_vis_pipeline_set_blocked (player, FALSE);
--        break;
--    case GST_EVENT_CUSTOM_DOWNSTREAM:
--    case GST_EVENT_NEWSEGMENT:
--        _bp_vis_pipeline_set_blocked (player, TRUE);
--        break;
--
--    default: break;
--    }
--
--    return TRUE;
-+    return GST_PAD_PROBE_PASS;
- }
- 
- void
-@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     // Core elements, if something fails here, it's the end of the world
-     audiosinkqueue = gst_element_factory_make ("queue", "vis-queue");
- 
--    pad = gst_element_get_static_pad (audiosinkqueue, "sink");
--    gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player);
--    gst_object_unref (GST_OBJECT (pad));
-+    player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink");
-+    player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL);
- 
-     resampler = gst_element_factory_make ("audioresample", "vis-resample");
-     converter = gst_element_factory_make ("audioconvert", "vis-convert");
-@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-                       converter, fakesink, NULL);
-     
-     pad = gst_element_get_static_pad (audiosinkqueue, "sink");
--    teepad = gst_element_get_request_pad (player->audiotee, "src%d");
-+    teepad = gst_element_get_request_pad (player->audiotee, "src_%u");
-     gst_pad_link (teepad, pad);
-     gst_object_unref (GST_OBJECT (teepad));
-     gst_object_unref (GST_OBJECT (pad));
-@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     player->vis_resampler = resampler;
-     player->vis_thawing = FALSE;
-     player->vis_enabled = FALSE;
--
--    // Disable the pipeline till we hear otherwise from managed land.
--    _bp_vis_pipeline_set_blocked (player, TRUE);
- }
- 
- void
- _bp_vis_pipeline_destroy (BansheePlayer *player)
- {
-+    if (player->vis_event_probe_pad) {
-+        gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id);
-+        gst_object_unref (GST_OBJECT (player->vis_event_probe_pad));
-+        player->vis_event_probe_pad = NULL;
-+    }
-+
-     if (player->vis_buffer != NULL) {
-         gst_object_unref (player->vis_buffer);
-         player->vis_buffer = NULL;
-@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb
- 
-     player->vis_data_cb = cb;
- 
--    _bp_vis_pipeline_set_blocked (player, cb == NULL);
-     player->vis_enabled = cb != NULL;
- }
-diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
-index c655a72..b8f98b8 100644
---- a/libbanshee/banshee-player.c
-+++ b/libbanshee/banshee-player.c
-@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms)
- P_INVOKE guint64
- bp_get_position (BansheePlayer *player)
- {
--    static GstFormat format = GST_FORMAT_TIME;
-     gint64 position;
- 
-     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
- 
--    if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) {
-+    if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) {
-         return position / GST_MSECOND;
-     }
-     
-@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player)
- P_INVOKE guint64
- bp_get_duration (BansheePlayer *player)
- {
--    static GstFormat format = GST_FORMAT_TIME;
-     gint64 duration;
- 
-     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
- 
--    if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) {
-+    if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) {
-         return duration / GST_MSECOND;
-     }
-     
-@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     gint64 pos = -1;
-     GstState state;
--    GstFormat format = GST_FORMAT_BYTES;
-     gboolean paused = FALSE;
- 
-     // Gstreamer playbin do not support to set suburi during playback
-@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     gst_element_get_state (player->playbin, &state, NULL, 0);
-     paused = (state == GST_STATE_PAUSED);
-     if (state >= GST_STATE_PAUSED) {
--        gst_element_query_position (player->playbin, &format, &pos);
-+        gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos);
-         gst_element_set_state (player->playbin, GST_STATE_READY);
-         // Force to wait asynch operation
-         gst_element_get_state (player->playbin, &state, NULL, -1);
-@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     gst_element_get_state (player->playbin, &state, NULL, -1);
- 
-     if (pos != -1) {
--        gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
-+        gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
-     }
- }
- 
-diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c
-index e0e8c85..b3f8fed 100644
---- a/libbanshee/banshee-ripper.c
-+++ b/libbanshee/banshee-ripper.c
-@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug)
- static gboolean
- br_iterate_timeout (BansheeRipper *ripper)
- {
--    GstFormat format = GST_FORMAT_TIME;
-     GstState state;
-     gint64 position;
-     
-@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper)
-         return TRUE;
-     }
- 
--    if (!gst_element_query_position (ripper->cddasrc, &format, &position)) {
-+    if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) {
-         return TRUE;
-     }
-     
-@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin)
-         GstIterator *pad_iter = gst_element_iterate_src_pads (element);
-         
-         BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, {
--            GstStructure *str = GST_PAD_CAPS (pad) != NULL
--                ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0)
-+            GstCaps *caps = gst_pad_get_current_caps (pad);
-+            GstStructure *str = caps != NULL
-+                ? gst_caps_get_structure (caps, 0)
-                 : NULL;
- 
-             if (str != NULL) {
-@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin)
-                     preferred_mimetype = mimetype;    
-                 }
-             }
--            
--            gst_object_unref (pad);
-+            gst_caps_unref (caps);
-         });
--        
--        gst_object_unref (element);
-     });
- 
-     return preferred_mimetype;
-@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper)
-         return FALSE;
-     }
- 
--    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc");
-+    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL);
-     if (ripper->cddasrc == NULL) {
-         br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL);
-         return FALSE;
-@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path,
-             
-             // We'll warn the user in the UI if we can't tag the encoded audio files
-             *tagging_supported = TRUE;
--            gst_object_unref (element);
-         }
-     });
-     
-diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c
-index ca15e8f..762dfa9 100644
---- a/libbanshee/banshee-tagger.c
-+++ b/libbanshee/banshee-tagger.c
-@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata
- GstTagList *
- bt_tag_list_new ()
- {
--    return gst_tag_list_new ();
-+    return gst_tag_list_new_empty ();
- }
- 
- void
-diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
-index 10fc35c..0e241f0 100644
---- a/libbanshee/banshee-transcoder.c
-+++ b/libbanshee/banshee-transcoder.c
-@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const
- static gboolean
- gst_transcoder_iterate_timeout(GstTranscoder *transcoder)
- {
--    GstFormat format = GST_FORMAT_TIME;
-     gint64 position;
-     gint64 duration;
- 
-     g_return_val_if_fail(transcoder != NULL, FALSE);
- 
--    if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) ||
--        !gst_element_query_position(transcoder->sink_bin, &format, &position)) {
-+    if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) ||
-+        !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) {
-         return TRUE;
-     }
- 
-@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad,
- 
-     g_return_if_fail(transcoder != NULL);
- 
--    audiopad = gst_element_get_pad(transcoder->sink_bin, "sink");
-+    audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink");
-     
-     if(GST_PAD_IS_LINKED(audiopad)) {
-         g_object_unref(audiopad);
-         return;
-     }
- 
--    caps = gst_pad_get_caps(pad);
-+    caps = gst_pad_query_caps(pad, NULL);
-     str = gst_caps_get_structure(caps, 0);
-     
-     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
-@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
-     
-     transcoder->pipeline = gst_pipeline_new("pipeline");
- 
--    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source");
-+    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL);
-     if(source_elem == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL);
-         return FALSE;
-     }
- 
--    decoder_elem = gst_element_factory_make("decodebin2", "decodebin2");
-+    decoder_elem = gst_element_factory_make("decodebin", "decodebin");
-     if(decoder_elem == NULL) {
--        gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL);
-+        gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL);
-         return FALSE;
-     }
-     
--    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink");
-+    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL);
-     if(sink_elem == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL);
-         return FALSE;
-@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
-          return FALSE;
-     }
- 
--    encoder_pad = gst_element_get_pad(conv_elem, "sink");
-+    encoder_pad = gst_element_get_static_pad(conv_elem, "sink");
-     if(encoder_pad == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL);
-         return FALSE;
--- 
-1.7.10.4
\ No newline at end of file
diff --git a/testing/baobab/PKGBUILD b/testing/baobab/PKGBUILD
deleted file mode 100644
index 5d9f45bcd..000000000
--- a/testing/baobab/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169273 2012-10-18 19:29:39Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=baobab
-pkgver=3.6.2
-pkgrel=1
-pkgdesc="A graphical directory tree analyzer"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8ffef397f11fb1e7105d1429be828e88b9ceb5746984f0bb978e66e87faf047a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/baobab/baobab.install b/testing/baobab/baobab.install
deleted file mode 100644
index 5a3c24041..000000000
--- a/testing/baobab/baobab.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD
deleted file mode 100644
index 51be4e9f7..000000000
--- a/testing/bash/PKGBUILD
+++ /dev/null
@@ -1,155 +0,0 @@
-# $Id: PKGBUILD 163782 2012-07-20 02:08:58Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=bash
-_basever=4.2
-_patchlevel=037 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=1
-pkgdesc="The GNU Bourne Again shell"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnu.org/software/bash/bash.html"
-groups=('base')
-backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
-depends=('readline>=6.1' 'glibc')
-provides=('sh')
-install=bash.install
-source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
-        dot.bashrc
-        dot.bash_profile
-        dot.bash_logout
-        system.bashrc
-        system.bash_logout)
-if [ $_patchlevel -gt 000 ]; then
-    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-        source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
-    done
-fi
-
-build() {
-  cd ${srcdir}/${pkgname}-$_basever
-  for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-    msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
-    patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
-  done
-
-  _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\'
-               -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\'
-               -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\'
-               -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\')
-  export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
-
-  ./configure --prefix=/usr --with-curses --enable-readline \
-    --without-bash-malloc --with-installed-readline \
-    --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make DESTDIR=${pkgdir} install
-
-  # for now, bash is our default /bin/sh
-  cd ${pkgdir}/bin
-  ln -s bash sh
-
-  install -dm755 ${pkgdir}/etc/skel/
-  
-  # system-wide configuration files
-  install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
-  install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout
-  
-  # user configuration file skeletons
-  install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc
-  install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile
-  install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
-}
-
-md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
-         '8d37a3f97a48c1e56e1a4ded877ed944'
-         '027d6bd8f5f6a06b75bb7698cb478089'
-         '2902e0fee7a9168f3a4fd2ccd60ff047'
-         '42f4400ed2314bd7519c020d0187edc5'
-         '3546099a1b2f667adc9794f52e78e35b'
-         '472f536d7c9e8250dc4568ec4cfaf294'
-         '1100bc1dda2cdc06ac44d7e5d17864a3'
-         'a7184b76eb4a079f10174a0a8f574819'
-         '30e7948079921d3261efcc6a40722135'
-         'c4d45307f7e69fe508ce347c4cec1955'
-         '9ea06decec43a198f3d7cf29acc602f8'
-         '74bddae6eeb9227a04a467d42597a34d'
-         'fb48f6134d7b013135929476aa0c250c'
-         '3e6a18226b16c773229246abd07a1f5e'
-         'e70e45de33426b38153b390be0dbbcd4'
-         'e667dc9348ebc3e0e14bfdd87f4b6ff2'
-         'ce4e5c484993705b27daa151eca242c2'
-         '41cbd8e57589bc081a546a014ddb12f8'
-         '88d1f96db29461767602e2546803bda7'
-         'b8b781520f4c7493a2a1ac3010a44a44'
-         '24c574bf6d6a581e300823d9c1276af6'
-         '354a0899a7c4b446454c52546562b55b'
-         '4c5835f2fbab36c4292bb334977e5b6d'
-         'ff4547ca7b508d52101729d61f5b77b6'
-         '0a51602b535ef661ee707be6c8bdb373'
-         'cec7c92a4d8052ea4b29216365d16566'
-         '58deacf3d57cbd75575444ff6a3b0806'
-         '9ed2a08e549c3c17745f19e8413cfb31'
-         '72d5059820015231483bb7415d09e9db'
-         '45b04b41a4230f469d3e47ab9952c2df'
-         '608336ebe215984ef126e3c29d2d3409'
-         '623f63025d155a84977b62531e260ee2'
-         'ed19da878e3f630834c62b9d9dcc6fce'
-         'eef2dd4a0e4505dc8f8e664b40c6cd66'
-         '2d07daba0b8ca8f876d2aa052ff594b4'
-         '0cb823a44e6dc1cde7ac97ae5c8163c9'
-         '53d246537e1fffd1aaa02ba5c056211c'
-         '60f983a1dded5f0b28040ff4b3f1e9b5'
-         '304fd129a58fee2d8a34f8b4704db0aa'
-         '9df4bf4f46aaadc436f430187741f815'
-         '6921a0b4228fe89b6537a5c29f027c89'
-         '4ef0e2a2cbfbdd53346f927000b7e112'
-         '1195d85447f3d048d2c9bcd075fa765c'
-         'b0f3a651ce29a1feee687d93177870f1'
-         'b09000bba08da6ac753124593850cdf7'
-         '204bb5054d1f8bafe2b446d4e5d0d99a'
-         '09d3f96a16b881334cfaee0cf320b47e'
-         'aab415350bcc2bb0c29943b413499d96'
-         '597bf71a2aac6feb510b7505cdd3d4f7'
-         'b0db384bdedecafbdd70c8d22c56af5f'
-         '3fab459b4e09daea529cacad025b13b3'
-         'bab99835ad6198cb1109fac89a085262'
-         '4ad8d11e72afc6090e701073ff034cf4'
-         '5658ef10c9d0d804126ec1ce700e4e2c'
-         'c7d2493e44490f01dd20bdc8feb0a6a7'
-         'e4855dbc4b743618b54d408bd5878637'
-         '9f19c199dd8d1fa9254eebe738759272'
-         '600c8e90c2fb13cdbc7aa3f18566df03'
-         'a6ed82daf034587aee2f2581ba5fe829'
-         '821620a0389df723644911c56796ca8c'
-         'da9265aa2527fd4a7481baa3e0550287'
-         '0043f8b75f46f43608a67b863e300fe8'
-         'ec444d229e8899fbaaf6fc7de2d82ae6'
-         'b632fca3a4943825bfaf3bd29df6b27d'
-         'b4bc1c4dc1b508ff9cdfc44f1a5039b5'
-         '2ffa9a802bbd57540021715f84cc76f4'
-         '89390ff6a3c2ef7e09dd4b8b097a8e56'
-         '3e9b529ef3726b75d125d678de76977f'
-         'eee08003395c417f677d1a4bf8c548ee'
-         'f670f7672b11d0df8c31885dbf15f390'
-         '2fe070dd6d75d8ff16f269184a16e9c4'
-         '5018b6b7737808141043b57cf4eb842d'
-         '4e610506c1711bf3483b965800ac3d5d'
-         'cb65e541f9b60a8cb1fe58404f264b73'
-         '7cd9bfdf7cbfd45274d07620ee94c8d9'
-         'a7d2eace0da5fd236c93dbfd93458838'
-         '9c3142956064d175a880bcb186e51ef9'
-         'a1a87649853f20fe99572ddc02b0c67f'
-         'c10692f447d4966c879f8fb8d7c8ebc9'
-         '1bf5e34ad46566bc2d0eb7560ff8968e')
diff --git a/testing/bash/bash.install b/testing/bash/bash.install
deleted file mode 100644
index bc75e9b6a..000000000
--- a/testing/bash/bash.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(bash.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/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
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout
deleted file mode 100644
index 0e4e4f184..000000000
--- a/testing/bash/dot.bash_logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# ~/.bash_logout
-#
diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile
deleted file mode 100644
index 5545f007e..000000000
--- a/testing/bash/dot.bash_profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# ~/.bash_profile
-#
-
-[[ -f ~/.bashrc ]] && . ~/.bashrc
diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc
deleted file mode 100644
index a355b0cd3..000000000
--- a/testing/bash/dot.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# ~/.bashrc
-#
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-alias ls='ls --color=auto'
-PS1='[\u@\h \W]\$ '
diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout
deleted file mode 100644
index a76e48e4a..000000000
--- a/testing/bash/system.bash_logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# /etc/bash.bash_logout
-#
diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc
deleted file mode 100644
index a2231e861..000000000
--- a/testing/bash/system.bashrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# /etc/bash.bashrc
-#
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-PS1='[\u@\h \W]\$ '
-PS2='> '
-PS3='> '
-PS4='+ '
-
-case ${TERM} in
-  xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
-    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-                                                        
-    ;;
-  screen)
-    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-    ;;
-esac
-
-[ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone
deleted file mode 100644
index 509c311f6..000000000
--- a/testing/bind/127.0.0.zone
+++ /dev/null
@@ -1,11 +0,0 @@
-$ORIGIN 0.0.127.in-addr.arpa.
-
-@			1D IN SOA	localhost. root.localhost. (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	localhost.
-1			1D IN PTR	localhost.
diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD
deleted file mode 100644
index 8a2ee6ae3..000000000
--- a/testing/bind/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 164044 2012-07-25 00:35:41Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
-
-pkgname=bind
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.1.P2
-_pkgver=9.9.1-P2
-pkgrel=1
-
-pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64')
-options=('!makeflags' '!libtool')
-depends=('openssl' 'krb5' 'libxml2')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'root.hint::http://www.internic.net/zones/named.root'
-        'remove-tools.patch'
-        'named'
-        'named.conf'
-        'named.conf.d'
-        'named.service'
-        'named.logrotate'
-        'localhost.zone'
-        '127.0.0.zone')
-sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7'
-          'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
-          '18f477f510df31e6c6f547ee2d5fc46e973479bf'
-          '46232e9db243c6c05e170a1781d7a7f413be5d03'
-          '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
-          '7848edbfb9a848843f57c11c02b0289eefd42d00'
-          '05fb2346a30dee2f99c40914dd23708729839b64'
-          '9ffb5c3f72390a517aeae557e32349d5d278cb63'
-          '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9')
-
-provides=('dns-server')
-
-install=install
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-tools.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-libxml2 \
-		--with-libtool \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	make DESTDIR="${pkgdir}" install
-
-	rmdir "${pkgdir}/var/run"
-	install -d "${pkgdir}"/usr/share/doc/bind
-	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
-
-	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
-	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
-	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
-	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
-	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
-
-	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
-}
diff --git a/testing/bind/install b/testing/bind/install
deleted file mode 100644
index 287d0e05b..000000000
--- a/testing/bind/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-	getent group named &>/dev/null || groupadd -g 40 named
-	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
-	passwd -l named &>/dev/null
-
-	touch var/log/named.log
-	chown named:named var/log/named.log
-
-	# create an rndc.key if it doesn't already exist
-	if [[ ! -s etc/rndc.key ]]; then
-		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
-		chown root:named etc/rndc.key
-		chmod 640 etc/rndc.key
-	fi
-}
-
-pre_remove() {
-	getent passwd named &>/dev/null && userdel named >/dev/null
-	getent group named &>/dev/null && groupdel named >/dev/null
-	return 0
-}
diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone
deleted file mode 100644
index e3ff9641c..000000000
--- a/testing/bind/localhost.zone
+++ /dev/null
@@ -1,10 +0,0 @@
-$ORIGIN localhost.
-@			1D IN SOA	@ root (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	@
-			1D IN A		127.0.0.1
diff --git a/testing/bind/named b/testing/bind/named
deleted file mode 100755
index 7907f9983..000000000
--- a/testing/bind/named
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-[[ -d /var/run/named ]] || mkdir -p /var/run/named
-chown named:named /var/run/named
-
-PIDFILE=/var/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
-  start)
-    stat_busy "Starting BIND"
-    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon named
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping BIND"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon named
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading BIND"
-    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
diff --git a/testing/bind/named.conf b/testing/bind/named.conf
deleted file mode 100644
index 38fb12cbe..000000000
--- a/testing/bind/named.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-// 
-// /etc/named.conf
-//
-
-options {
-	directory "/var/named";
-	pid-file "/var/run/named/named.pid";
-	auth-nxdomain yes;
-	datasize default;
-// Uncomment these to enable IPv6 connections support
-// IPv4 will still work:
-//	listen-on-v6 { any; };
-// Add this for no IPv4:
-//	listen-on { none; };
-
-	// Default security settings.
-	allow-recursion { 127.0.0.1; };
-	allow-transfer { none; };
-	allow-update { none; };
-    version none;
-    hostname none;
-    server-id none;
-};
-
-zone "localhost" IN {
-	type master;
-	file "localhost.zone";
-	allow-transfer { any; };
-};
-
-zone "0.0.127.in-addr.arpa" IN {
-	type master;
-	file "127.0.0.zone";
-	allow-transfer { any; };
-};
-
-zone "." IN {
-	type hint;
-	file "root.hint";
-};
-
-//zone "example.org" IN {
-//	type slave;
-//	file "example.zone";
-//	masters {
-//		192.168.1.100; 
-//	};
-//	allow-query { any; };
-//	allow-transfer { any; };
-//};
-
-logging {
-        channel xfer-log {
-                file "/var/log/named.log";
-                print-category yes;
-                print-severity yes;
-                print-time yes;
-                severity info;
-        };
-        category xfer-in { xfer-log; };
-        category xfer-out { xfer-log; };
-        category notify { xfer-log; };
-};
-
diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d
deleted file mode 100644
index aecbd2307..000000000
--- a/testing/bind/named.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate
deleted file mode 100644
index ef1a2d032..000000000
--- a/testing/bind/named.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/named.log {
-   missingok
-   postrotate
-      /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/testing/bind/named.service b/testing/bind/named.service
deleted file mode 100644
index 77196f785..000000000
--- a/testing/bind/named.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Internet domain name server
-
-[Service]
-ExecStart=/usr/sbin/named -f -u named
-ExecReload=/usr/sbin/rndc reload
-ExecStop=/usr/sbin/rndc stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/bind/remove-tools.patch b/testing/bind/remove-tools.patch
deleted file mode 100644
index cbd1c53ad..000000000
--- a/testing/bind/remove-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PKCS11_TOOLS@
- TARGETS =
- 
diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD
deleted file mode 100644
index 9edcd567b..000000000
--- a/testing/binutils/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 169653 2012-10-25 03:29:55Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils
-pkgver=2.23
-pkgrel=1
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('base-devel')
-depends=('glibc>=2.16' 'zlib')
-checkdepends=('dejagnu' 'bc')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
-md5sums=('6e6c85eb4468501051ae209c9e2a7ecc'
-         '46ca898c6c7ab8f35c676a965c7ce804')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
-    --with-lib-path=/usr/lib:/usr/local/lib \
-    --with-bugurl=https://bugs.archlinux.org/ \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads --enable-shared \
-    --disable-werror --disable-multilib
-
-  # check the host environment and makes sure all the necessary tools are available
-  make configure-host
-
-  make tooldir=${pkgdir}/usr
-
-  # Rebuild libiberty.a with -fPIC
-  cp -a libiberty libiberty-pic
-  make -C libiberty-pic clean
-  make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
-  # Rebuild libbfd.a with -fPIC
-  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
-  cp -a bfd bfd-pic
-  make -C bfd-pic clean
-  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-
-  # Rebuild libopcodes.a with -fPIC
-  cp -a opcodes opcodes-pic
-  make -C opcodes-pic clean 
-  make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-  
-  # unset LDFLAGS as testsuite makes assumptions about which ones are active
-  # do not abort on errors - manually check log files
-  make LDFLAGS="" -k check || true
-}
-
-package() {
-  cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-  
-  # Add some useful headers
-  install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include
-  install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include
-
-  # install libraries rebuilt with -fPIC
-  install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
-  install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
-  install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib
-
-  # Remove Windows/Novell specific man pages
-  rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
-  # Remove these symlinks, they are not ABI stable.
-  # Programs should compile static to the .a file.
-  rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
-  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
-  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
-}
diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/testing/binutils/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-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/bison/PKGBUILD b/testing/bison/PKGBUILD
deleted file mode 100644
index 2e82c6d1b..000000000
--- a/testing/bison/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169565 2012-10-23 14:54:01Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-
-pkgname=bison
-pkgver=2.6.4
-pkgrel=1
-pkgdesc="The GNU general-purpose parser generator"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/bison/bison.html"
-depends=('glibc' 'm4' 'sh')
-groups=('base-devel')
-install=bison.install
-source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('8b2dc57eb9d2d6de4715d30de6b2ee07'
-         '89b9f75a9aa1b02418fef0e685bd44f2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}  
-  ./configure --prefix=/usr --datadir=/usr/share
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/bison/bison.install b/testing/bison/bison.install
deleted file mode 100644
index 0081a194f..000000000
--- a/testing/bison/bison.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file=bison.info.gz
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-}
diff --git a/testing/bitlbee/PKGBUILD b/testing/bitlbee/PKGBUILD
deleted file mode 100644
index ecf6dd549..000000000
--- a/testing/bitlbee/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 163025 2012-07-05 23:25:55Z dreisner $
-
-# Contributor: FUBAR <mrfubar@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=bitlbee
-pkgver=3.0.5
-pkgrel=4
-pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
-url='http://www.bitlbee.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('openssl' 'glib2')
-makedepends=('asciidoc' 'libotr')
-optdepends=('skype4py: to use skyped'
-            'libotr: for OTR encryption support'
-            'xinetd: to run bitlbee through xinetd')
-source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-        'sbindir.patch'
-        'xinetd'
-        'rc.d'
-        'bitlbee.tmpfiles')
-sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
-          '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
-          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '02423c500ac64f673ba26a3395c7c7036c17343e'
-          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
-backup=('etc/bitlbee/bitlbee.conf'
-        'etc/bitlbee/motd.txt'
-        'etc/xinetd.d/bitlbee')
-install=bitlbee.install
-
-build() { 
-	cd "$pkgname-$pkgver"
-
-	patch -p1 -i ../sbindir.patch
-
-	./configure \
-		--prefix=/usr \
-		--etcdir=/etc/bitlbee \
-		--pidfile=/run/bitlbee/bitlbee.pid \
-		--ipcsocket=/run/bitlbee/bitlbee.sock \
-		--systemdsystemunitdir=/usr/lib/systemd/system \
-		--ssl=openssl \
-		--strip=0 \
-		--otr=plugin \
-		--skype=plugin
-
-	make
-}
-
-package() {
-	make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
-
-	install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-	install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-	install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
-	install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
-}
diff --git a/testing/bitlbee/bitlbee.install b/testing/bitlbee/bitlbee.install
deleted file mode 100644
index aa5a81a70..000000000
--- a/testing/bitlbee/bitlbee.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
-	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-	systemd-tmpfiles --create bitlbee.conf
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
-	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
-	true
-}
diff --git a/testing/bitlbee/bitlbee.tmpfiles b/testing/bitlbee/bitlbee.tmpfiles
deleted file mode 100644
index da72a0a79..000000000
--- a/testing/bitlbee/bitlbee.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/testing/bitlbee/rc.d b/testing/bitlbee/rc.d
deleted file mode 100644
index ade85221a..000000000
--- a/testing/bitlbee/rc.d
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/bitlbee/bitlbee.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting bitlbee daemon"
-    if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then
-      stat_fail
-      exit 1
-    else
-      add_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping bitlbee daemon"
-    if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
-      stat_fail
-      exit 1
-    else
-      rm -f "$pidfile"
-      rm_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-    ;;
-esac
-
-# vim: set ft=sh et ts=2 sw=2:
diff --git a/testing/bitlbee/sbindir.patch b/testing/bitlbee/sbindir.patch
deleted file mode 100644
index 7640508f7..000000000
--- a/testing/bitlbee/sbindir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -aur old/Makefile new/Makefile
---- old/Makefile	2012-02-18 21:55:09.000000000 +1100
-+++ new/Makefile	2012-02-20 18:28:08.716130584 +1100
-@@ -135,8 +135,8 @@
- 
- systemd:
- ifdef SYSTEMDSYSTEMUNITDIR
--	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
--	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
-+	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
-+	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
- endif
- 
- install-systemd:
diff --git a/testing/bitlbee/xinetd b/testing/bitlbee/xinetd
deleted file mode 100644
index d671a8cfc..000000000
--- a/testing/bitlbee/xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-service bitlbee
-{
-        type = UNLISTED
-        socket_type = stream
-        protocol = tcp
-        wait = no
-        user = bitlbee
-	group = bitlbee
-        server = /usr/sbin/bitlbee
-        port = 6667
-        disable = yes
-}
diff --git a/testing/bluez/PKGBUILD b/testing/bluez/PKGBUILD
deleted file mode 100644
index 2e1f83af6..000000000
--- a/testing/bluez/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 162114 2012-06-20 10:11:40Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-
-pkgname=bluez
-pkgver=4.100
-pkgrel=2
-pkgdesc="Libraries and tools for the Bluetooth protocol stack"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('dbus-core' 'python2' 'systemd-tools')
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx')
-optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
-            "alsa-lib: Audio bluetooth devices support"
-            "dbus-python: to run bluez-simple-agent"
-            "pygobject: to run bluez-simple-agent"
-            "libusb-compat: USB adapters support"
-            "cups: CUPS backend")
-conflicts=('bluez-libs' 'bluez-utils')
-provides=('bluez-libs' 'bluez-utils')
-replaces=('bluez-libs' 'bluez-utils')
-options=('!libtool')
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
-        'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-        'bluetooth.conf.d'
-	'rc.bluetooth'
-	'org.bluez.service')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cp ../org.bluez.service src/
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/lib \
-    --enable-gstreamer \
-    --enable-alsa \
-    --enable-usb \
-    --enable-tools \
-    --enable-bccmd \
-    --enable-dfutool \
-    --enable-hid2hci \
-    --enable-hidd \
-    --enable-pand \
-    --enable-dund \
-    --enable-cups \
-    --enable-wiimote \
-    --disable-test \
-    --with-systemdunitdir=/usr/lib/systemd/system
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth
-  
-  install -d ${pkgdir}/etc/bluetooth
-  install -m644 network/network.conf \
-                input/input.conf \
-                audio/audio.conf \
-                serial/serial.conf \
-    ${pkgdir}/etc/bluetooth/
-  
-  install -Dm644 ${srcdir}/bluetooth.conf.d \
-    ${pkgdir}/etc/conf.d/bluetooth
-
-  # FS#27630
-  install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
-  install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
-  install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
-  sed -i 's#/usr/bin/python#/usr/bin/python2#' \
-    "${pkgdir}"/usr/bin/bluez-simple-agent \
-    "${pkgdir}"/usr/bin/bluez-test-device \
-    "${pkgdir}"/usr/bin/bluez-test-input
-}
-md5sums=('54809d476c52665ff64594b6828016b5'
-         '7412982b440f29fa7f76a41a87fef985'
-         '864cbd24e6efc3592e9284b0b5fb2cfd'
-         '54c7de598327bf11d56592235d0702f4')
diff --git a/testing/bluez/bluetooth.conf.d b/testing/bluez/bluetooth.conf.d
deleted file mode 100644
index 1c1e02589..000000000
--- a/testing/bluez/bluetooth.conf.d
+++ /dev/null
@@ -1,30 +0,0 @@
-# Bluetooth configuraton file
-
-# Bluetooth services (allowed values are "true" and "false")
-
-# Run the bluetoothd daemon (default: true)
-#DAEMON_ENABLE="false"
-
-# Run the sdp daemon (default: false)
-# If this is disabled, hcid's internal sdp daemon will be used
-#SDPD_ENABLE="true"
-
-# Run the bluetooth HID daemon (default: false)
-#HIDD_ENABLE="true"
-
-# Activate rfcomm ports (default: false)
-#RFCOMM_ENABLE="true"
-
-# Run bluetooth dial-up networking daemon (default: false)
-#DUND_ENABLE="true"
-
-# Run bluetooth PAN daemon (default: false)
-#PAND_ENABLE="true"
-
-# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
-#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Options for hidd, dund and pand (default: none)
-HIDD_OPTIONS="--server"
-#DUND_OPTIONS=""
-#PAND_OPTIONS=""
diff --git a/testing/bluez/org.bluez.service b/testing/bluez/org.bluez.service
deleted file mode 100644
index dd7ae8f1c..000000000
--- a/testing/bluez/org.bluez.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.bluez
-Exec=/bin/false
-User=root
-SystemdService=dbus-org.bluez.service
diff --git a/testing/bluez/rc.bluetooth b/testing/bluez/rc.bluetooth
deleted file mode 100644
index 0feeaeab6..000000000
--- a/testing/bluez/rc.bluetooth
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="bluetoothd"
-HIDD_NAME="hidd"
-RFCOMM_NAME="rfcomm"
-PAND_NAME="pand"
-DUND_NAME="dund"
-
-DAEMON_EXEC="/usr/sbin/bluetoothd"
-HIDD_EXEC="/usr/bin/hidd"
-RFCOMM_EXEC="/usr/bin/rfcomm"
-PAND_EXEC="/usr/bin/pand"
-DUND_EXEC="/usr/bin/dund"
-
-DAEMON_ENABLE="true"
-HIDD_ENABLE="false"
-RFCOMM_ENABLE="false"
-PAND_ENABLE="false"
-DUND_ENABLE="false"
-
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-HIDD_OPTIONS=""
-PAND_OPTIONS=""
-DUND_OPTIONS=""
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-case "$1" in
-  start)
-    stat_busy "Starting bluetooth subsystem:"
-    if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
-      stat_append " $DAEMON_NAME"
-      $DAEMON_EXEC
-      sleep 1
-    fi
-    if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
-      stat_append " $HIDD_NAME"
-      $HIDD_EXEC $HIDD_OPTIONS
-    fi
-    if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
-    fi
-    if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
-      stat_append " $PAND_NAME"
-      $PAND_EXEC $PAND_OPTIONS
-    fi
-    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
-      stat_append " $DUND_NAME"
-      $DUND_EXEC $DUND_OPTIONS
-    fi
-    add_daemon bluetooth
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping bluetooth subsystem:"
-
-    stat_append " $DUND_NAME"
-    killall $DUND_NAME >/dev/null 2>&1
-
-    stat_append " $PAND_NAME"
-    killall $PAND_NAME >/dev/null 2>&1
-
-    if [ -x "$RFCOMM_EXEC" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC release all >/dev/null 2>&1
-    fi
-
-    stat_append " $HIDD_NAME"
-    killall $HIDD_NAME >/dev/null 2>&1
-
-    stat_append " $DAEMON_NAME"
-    killall $DAEMON_NAME >/dev/null 2>&1
-
-    rm_daemon bluetooth
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/boost/PKGBUILD b/testing/boost/PKGBUILD
deleted file mode 100644
index 7176a6a3c..000000000
--- a/testing/boost/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 163544 2012-07-15 13:16:35Z ibiru $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
-
-pkgbase=boost
-pkgname=('boost-libs' 'boost')
-pkgver=1.50.0
-_boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
-license=('custom')
-md5sums=('dbc07ab0254df3dda6300fd737b3f264')
-
-_stagedir="${srcdir}/stagedir"
-
-build() {
-  # set python path for bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
-  echo "using mpi ;" >> build/v2/user-config.jam
-
-  cd "${srcdir}"/${pkgbase}_${_boostver}
-
-  # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
-  ./build.sh cc
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
-  install -d "${_stagedir}"/usr/bin
-  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
-  # build tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
-  "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
-  # copy the tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
-  for i in *;do
-      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
-  done
-
-  #boostbook needed by quickbook
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
-  cp -r share "${_stagedir}"
-
-  # build libs
-  cd "${srcdir}/${pkgbase}_${_boostver}"
-
-  # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=single,multi"
-  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
-  # and installs includes in /usr/include/boost.
-  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
-  # install to ${_stagedir} in preparation for split packaging
-
-  "${_stagedir}"/usr/bin/bjam \
-      release debug-symbols=off threading=multi \
-      runtime-link=shared link=shared,static \
-      cflags=-fno-strict-aliasing \
-      toolset=gcc \
-      --prefix="${_stagedir}" \
-      -sTOOLS=gcc \
-      --layout=system \
-      ${MAKEFLAGS} \
-      install
-}
-
-package_boost() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
-    depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python bindings'
-                'python2: for python2 bindings'
-		'boost-build: to use boost jam for building your project.')
-
-    install -d "${pkgdir}"/usr/{include,lib,share}
-    # headers/source files
-    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
-    # static libs
-    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
-    # utilities (bjam, bcp, pyste)
-    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
-
-    #boostbook
-    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
-}
-
-package_boost-libs() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
-    optdepends=('openmpi: for mpi support')
-
-    install -d "${pkgdir}/usr/lib"
-    #shared libs
-    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
-}
diff --git a/testing/bootchart/PKGBUILD b/testing/bootchart/PKGBUILD
deleted file mode 100644
index acb3e0072..000000000
--- a/testing/bootchart/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 165562 2012-08-24 16:48:42Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-pkgname="bootchart"
-pkgver=1.20
-pkgrel=1
-pkgdesc="A 'startup' graphing tool"
-url="https://github.com/sofar/bootchart"
-license=('GPL2')
-arch=(i686 x86_64)
-depends=('glibc')
-source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sbindir=/usr/bin
- 
-   make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('071c67856a2b16e1a9e93a058de3eb65')
diff --git a/testing/brasero/PKGBUILD b/testing/brasero/PKGBUILD
deleted file mode 100644
index 04fa8e0bb..000000000
--- a/testing/brasero/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169272 2012-10-18 19:29:34Z jgc $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=brasero
-pkgver=3.6.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' 'gst-plugins-base' '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' 'itstool' 'docbook-xsl')
-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=('1eb16f85c5663f3f38ee60516759c0980024b893af9ec7875d31208a53c12b3b')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-caches \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/testing/brasero/brasero.install b/testing/brasero/brasero.install
deleted file mode 100644
index 9248062f7..000000000
--- a/testing/brasero/brasero.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  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
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/brltty/PKGBUILD b/testing/brltty/PKGBUILD
deleted file mode 100644
index 76d9f9466..000000000
--- a/testing/brltty/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 167187 2012-09-26 22:24:47Z tomegun $
-# Maintainer:
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=brltty
-pkgver=4.3
-pkgrel=6
-pkgdesc="Braille display driver for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://mielke.cc/brltty"
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex')
-makedepends=('bluez')
-optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
-install=brltty.install
-source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
-        'brltty'
-        'brltty.conf'
-	'brltty.service')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --localstatedir=/var \
-    --with-screen-driver=a2 \
-    --enable-gpm \
-    --disable-java-bindings \
-    --disable-caml-bindings \
-    PYTHON=/usr/bin/python2
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir" install
-  install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
-  install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
-  install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
-  install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
-}
-md5sums=('5ada573f88df32b6150db3b9a620e20b'
-         '831ebaf0c56091702929c68805d20c4f'
-         'a8ab8b3dd059e96e1734bc9cdcf844fc'
-         '7acecd700b9f94d76fe4a6ad56cb0448')
diff --git a/testing/brltty/brltty b/testing/brltty/brltty
deleted file mode 100755
index 5ed21a52d..000000000
--- a/testing/brltty/brltty
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=brltty
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $brltty_args
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/brltty/brltty.conf b/testing/brltty/brltty.conf
deleted file mode 100644
index 94115e1d5..000000000
--- a/testing/brltty/brltty.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Specify any arguments to pass to brltty here.
-brltty_args=""
\ No newline at end of file
diff --git a/testing/brltty/brltty.install b/testing/brltty/brltty.install
deleted file mode 100644
index 952ae58ff..000000000
--- a/testing/brltty/brltty.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install () {
-     getent group brlapi  &>/dev/null || groupadd -r brlapi
-     if [ ! -e /etc/brlapi.key ]; then
-         mcookie >/etc/brlapi.key
-         chmod 0640 /etc/brlapi.key
-         chgrp brlapi /etc/brlapi.key
-         echo "Please add your user to the brlapi group."
-     fi
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove () {
-    getent group brlapi >/dev/null 2>&1 && groupdel brlapi
-    if [ -e /etc/brlapi.key ]; then
-        rm -f /etc/brlapi.key
-    fi
-}
diff --git a/testing/brltty/brltty.service b/testing/brltty/brltty.service
deleted file mode 100644
index 1b9d55e32..000000000
--- a/testing/brltty/brltty.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Braille Console Driver
-DefaultDependencies=no
-Before=sysinit.target
-
-[Service]
-ExecStart=/usr/bin/brltty --pid-file=/run/brltty.pid
-Type=forking
-PIDFile=/run/brltty.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/btrfs-progs/70-btrfs.rules b/testing/btrfs-progs/70-btrfs.rules
deleted file mode 100644
index c0e8c776c..000000000
--- a/testing/btrfs-progs/70-btrfs.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k"
diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD
deleted file mode 100644
index ee0a1bf57..000000000
--- a/testing/btrfs-progs/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 169471 2012-10-21 19:56:53Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=btrfs-progs
-pkgver=0.19.20121005
-pkgrel=2
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-url="http://btrfs.wiki.kernel.org/"
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
-	initcpio-install-btrfs
-	initcpio-hook-btrfs)
-install=btrfs-progs.install
-md5sums=('7fb014324954ee073b039dc0066de960'
-         'd7ad825b0b25f2be73289a20e7afcdb7'
-         'b09688a915a0ec8f40e2f5aacbabc9ad')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-   make CFLAGS="$CFLAGS"
-
-   # install mkinitcpio hooks
-   install -Dm644 "$srcdir/initcpio-install-btrfs" \
-     "$pkgdir/usr/lib/initcpio/install/btrfs"
-   install -Dm644 "$srcdir/initcpio-hook-btrfs" \
-     "$pkgdir/usr/lib/initcpio/hooks/btrfs"
-}
-
-package() {
-   cd $srcdir/$pkgname-$pkgver
-   make prefix=$pkgdir/usr install
-   # fix manpage
-   mkdir -p $pkgdir/usr/share/
-   mv $pkgdir/usr/man $pkgdir/usr/share/man
-   mkdir -p ${pkgdir}/sbin
-   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-}
diff --git a/testing/btrfs-progs/btrfs-progs.install b/testing/btrfs-progs/btrfs-progs.install
deleted file mode 100644
index d6c0698a0..000000000
--- a/testing/btrfs-progs/btrfs-progs.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-  if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then
-    echo "btrfs multi-device support now relies on linux 3.6 or later"
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/btrfs-progs/btrfs.install b/testing/btrfs-progs/btrfs.install
deleted file mode 100644
index 077d7529a..000000000
--- a/testing/btrfs-progs/btrfs.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-  if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then
-    echo "btrfs multi-device support now relies on linux 3.6 or later"
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs
deleted file mode 100644
index 7965d0a8a..000000000
--- a/testing/btrfs-progs/initcpio-hook-btrfs
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    btrfs device scan
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs
deleted file mode 100644
index aa06e55ac..000000000
--- a/testing/btrfs-progs/initcpio-install-btrfs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module btrfs
-    add_binary btrfs
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes. This hook
-is only needed for initramfs images which do not use udev.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/bzflag/PKGBUILD b/testing/bzflag/PKGBUILD
deleted file mode 100644
index 1a71d13a7..000000000
--- a/testing/bzflag/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169629 2012-10-25 01:34:46Z eric $
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=bzflag
-pkgver=2.4.2
-pkgrel=2
-pkgdesc='Multiplayer 3D tank battle game'
-url='http://bzflag.org/'
-license=('LGPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('curl' 'glew' 'glu' 'sdl')
-makedepends=('mesa') # glu requires <GL/gl.h>
-source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
-sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
-
-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/bzr/PKGBUILD b/testing/bzr/PKGBUILD
deleted file mode 100644
index 655bba6dd..000000000
--- a/testing/bzr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168834 2012-10-16 11:53:33Z allan $
-# Maintainer :
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=bzr
-pkgver=2.5.1
-pkgrel=2
-pkgdesc="A decentralized revision control system (bazaar)"
-arch=('i686' 'x86_64')
-url="http://bazaar.canonical.com/en/"
-license=('GPL')
-depends=('python2')
-optdepends=('python2-paramiko: for sftp support')
-source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('ac5079858364a046071000d5cdccb67b'
-         'c83dd08dd2c3e27edbab873500d7d6eb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|man/man1|share/man/man1|' setup.py
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-    bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-
-  # bash-completion
-  install -D -m644 contrib/bash/bzr \
-    "${pkgdir}/usr/share/bash-completion/completions/bzr"
-}
diff --git a/testing/cabal-install/PKGBUILD b/testing/cabal-install/PKGBUILD
deleted file mode 100644
index 5ce042013..000000000
--- a/testing/cabal-install/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=cabal-install
-pkgver=1.16.0
-pkgrel=1
-pkgdesc="The command-line interface for Cabal and Hackage."
-url="http://hackage.haskell.org/package/cabal-install"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3')
-depends=('ghc' 'gmp' 'zlib')
-source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
-md5sums=('da046116eee7664158411fa9e2cf6b14')
-
-build() {
-  cd cabal-install-${pkgver}
-
-  runhaskell Setup configure \
-    --enable-shared \
-    --enable-split-objs \
-    --enable-executable-stripping \
-    --prefix=/usr
-
-  runhaskell Setup build
-}
-
-package() {
-  cd cabal-install-${pkgver}
-
-  runhaskell Setup copy --destdir=$pkgdir
-
-  # rm license installed to wrong location
-  rm -rf ${pkgdir}/usr/share/doc
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-    
-  # add bash completion
-  install -d ${pkgdir}/usr/share/bash-completion/completions
-  install -m644 bash-completion/cabal \
-    ${pkgdir}/usr/share/bash-completion/completions
-}
diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD
deleted file mode 100644
index 951f174dc..000000000
--- a/testing/cairo/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 169506 2012-10-22 17:33:56Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=cairo
-pkgver=1.12.6
-pkgrel=1
-pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url="http://cairographics.org/"
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'sh')
-makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm')
-optdepends=('xcb-util: for XCB backend') # really needed?
-provides=('cairo-xcb')
-replaces=('cairo-xcb')
-options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-        cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('a383c6cb4495e18848ea43e1031c294aa9417a43'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
-
-#  autoreconf -vfi
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-tee \
-	--disable-xlib-xcb \
-	# --enable-test-surfaces \ takes ages
-	#--enable-drm # breaks build
-  make
-}
-
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver"
-#  make -k check || /bin/true # 161 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
-#}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/cairo/cairo-1.10.0-buggy_gradients.patch b/testing/cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356d3..000000000
--- a/testing/cairo/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200

-+++ b/src/cairo-xlib-display.c	2010-08-04 11:58:28.000000000 +0200

-@@ -353,11 +353,7 @@

-     /* Prior to Render 0.10, there is no protocol support for gradients and

-      * we call function stubs instead, which would silently consume the drawing.

-      */

--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10

-     display->buggy_gradients = TRUE;

--#else

--    display->buggy_gradients = FALSE;

--#endif

-     display->buggy_pad_reflect = FALSE;

-     display->buggy_repeat = FALSE;

diff --git a/testing/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch b/testing/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch
deleted file mode 100644
index e3bb30580..000000000
--- a/testing/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-From f228769dfe5a8b5d73c49a41e95e31ed73a77fb3 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 08 Jun 2012 16:22:41 +0000
-Subject: polygon-reduce: Reduce broken stopped-edge continuation
-
-This is hopefully a lesser used path and the attempted optimisation to
-continue a stopped edge with a colinear stopped edge highly unlikely and
-lost in the noise of the general inefficiency of the routine. As it was
-broken, rather than attempt to rectify the "optimisation" remove it.
-
-Reported-by: Evangelos Foutras <evangelos@foutrelis.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50852
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-polygon-reduce.c b/src/cairo-polygon-reduce.c
-index 8758070..ea457fe 100644
---- a/src/cairo-polygon-reduce.c
-+++ b/src/cairo-polygon-reduce.c
-@@ -42,6 +42,8 @@
- #include "cairo-freelist-private.h"
- #include "cairo-combsort-inline.h"
- 
-+#define DEBUG_POLYGON 0
-+
- typedef cairo_point_t cairo_bo_point32_t;
- 
- typedef struct _cairo_bo_intersect_ordinate {
-@@ -114,7 +116,6 @@ typedef struct _cairo_bo_event_queue {
- 
- typedef struct _cairo_bo_sweep_line {
-     cairo_bo_edge_t *head;
--    cairo_bo_edge_t *stopped;
-     int32_t current_y;
-     cairo_bo_edge_t *current_edge;
- } cairo_bo_sweep_line_t;
-@@ -476,8 +477,8 @@ edges_compare_x_for_y (const cairo_bo_edge_t *a,
- static inline int
- _line_equal (const cairo_line_t *a, const cairo_line_t *b)
- {
--    return a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
--           a->p2.x == b->p2.x && a->p2.y == b->p2.y;
-+    return (a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
-+	    a->p2.x == b->p2.x && a->p2.y == b->p2.y);
- }
- 
- static int
-@@ -1024,7 +1025,6 @@ static void
- _cairo_bo_sweep_line_init (cairo_bo_sweep_line_t *sweep_line)
- {
-     sweep_line->head = NULL;
--    sweep_line->stopped = NULL;
-     sweep_line->current_y = INT32_MIN;
-     sweep_line->current_edge = NULL;
- }
-@@ -1139,6 +1139,8 @@ edges_colinear (const cairo_bo_edge_t *a, const cairo_bo_edge_t *b)
-      */
-     if (a->edge.line.p1.y == b->edge.line.p1.y) {
- 	return a->edge.line.p1.x == b->edge.line.p1.x;
-+    } else if (a->edge.line.p2.y == b->edge.line.p2.y) {
-+	return a->edge.line.p2.x == b->edge.line.p2.x;
-     } else if (a->edge.line.p1.y < b->edge.line.p1.y) {
- 	return edge_compare_for_y_against_x (b,
- 					     a->edge.line.p1.y,
-@@ -1205,82 +1207,48 @@ _active_edges_to_polygon (cairo_bo_edge_t		*left,
- 			  cairo_polygon_t	        *polygon)
- {
-     cairo_bo_edge_t *right;
-+    unsigned int mask;
- 
--    if (fill_rule == CAIRO_FILL_RULE_WINDING) {
--	while (left != NULL) {
--	    int in_out = left->edge.dir;
--
--	    right = left->next;
--	    if (left->deferred.right == NULL) {
--		while (right != NULL && right->deferred.right == NULL)
--		    right = right->next;
--
--		if (right != NULL && edges_colinear (left, right)) {
--		    /* continuation on left */
--		    left->deferred = right->deferred;
--		    right->deferred.right = NULL;
--		}
--	    }
--
--	    right = left->next;
--	    while (right != NULL) {
--		if (right->deferred.right != NULL)
--		    _cairo_bo_edge_end (right, top, polygon);
--
--		in_out += right->edge.dir;
--		if (in_out == 0) {
--		    cairo_bo_edge_t *next;
--		    cairo_bool_t skip = FALSE;
--
--		    /* skip co-linear edges */
--		    next = right->next;
--		    if (next != NULL)
--			skip = edges_colinear (right, next);
-+    if (fill_rule == CAIRO_FILL_RULE_WINDING)
-+	mask = ~0;
-+    else
-+	mask = 1;
- 
--		    if (! skip)
--			break;
--		}
-+    while (left != NULL) {
-+	int in_out = left->edge.dir;
- 
-+	right = left->next;
-+	if (left->deferred.right == NULL) {
-+	    while (right != NULL && right->deferred.right == NULL)
- 		right = right->next;
--	    }
--
--	    _cairo_bo_edge_start_or_continue (left, right, top, polygon);
- 
--	    left = right;
--	    if (left != NULL)
--		left = left->next;
-+	    if (right != NULL && edges_colinear (left, right)) {
-+		/* continuation on left */
-+		left->deferred = right->deferred;
-+		right->deferred.right = NULL;
-+	    }
- 	}
--    } else {
--	while (left != NULL) {
--	    int in_out = 0;
- 
--	    right = left->next;
--	    while (right != NULL) {
--		if (right->deferred.right != NULL)
--		    _cairo_bo_edge_end (right, top, polygon);
-+	right = left->next;
-+	while (right != NULL) {
-+	    if (right->deferred.right != NULL)
-+		_cairo_bo_edge_end (right, top, polygon);
- 
--		if ((in_out++ & 1) == 0) {
--		    cairo_bo_edge_t *next;
--		    cairo_bool_t skip = FALSE;
--
--		    /* skip co-linear edges */
--		    next = right->next;
--		    if (next != NULL)
--			skip = edges_colinear (right, next);
--
--		    if (! skip)
--			break;
--		}
--
--		right = right->next;
-+	    in_out += right->edge.dir;
-+	    if ((in_out & mask) == 0) {
-+		/* skip co-linear edges */
-+		if (right->next == NULL || !edges_colinear (right, right->next))
-+		    break;
- 	    }
- 
--	    _cairo_bo_edge_start_or_continue (left, right, top, polygon);
--
--	    left = right;
--	    if (left != NULL)
--		left = left->next;
-+	    right = right->next;
- 	}
-+
-+	_cairo_bo_edge_start_or_continue (left, right, top, polygon);
-+
-+	left = right;
-+	if (left != NULL)
-+	    left = left->next;
-     }
- }
- 
-@@ -1303,12 +1271,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 
-     while ((event = _cairo_bo_event_dequeue (&event_queue))) {
- 	if (event->point.y != sweep_line.current_y) {
--	    for (e1 = sweep_line.stopped; e1; e1 = e1->next) {
--		if (e1->deferred.right != NULL)
--		     _cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
--	    }
--	    sweep_line.stopped = NULL;
--
- 	    _active_edges_to_polygon (sweep_line.head,
- 				      sweep_line.current_y,
- 				      fill_rule, polygon);
-@@ -1328,23 +1290,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 	    if (unlikely (status))
- 		goto unwind;
- 
--	    /* check to see if this is a continuation of a stopped edge */
--	    /* XXX change to an infinitesimal lengthening rule */
--	    for (left = sweep_line.stopped; left; left = left->next) {
--		if (e1->edge.top <= left->edge.bottom &&
--		    edges_colinear (e1, left))
--		{
--		    e1->deferred = left->deferred;
--		    if (left->prev != NULL)
--			left->prev = left->next;
--		    else
--			sweep_line.stopped = left->next;
--		    if (left->next != NULL)
--			left->next->prev = left->prev;
--		    break;
--		}
--	    }
--
- 	    left = e1->prev;
- 	    right = e1->next;
- 
-@@ -1371,14 +1316,8 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 
- 	    _cairo_bo_sweep_line_delete (&sweep_line, e1);
- 
--	    /* first, check to see if we have a continuation via a fresh edge */
--	    if (e1->deferred.right != NULL) {
--		e1->next = sweep_line.stopped;
--		if (sweep_line.stopped != NULL)
--		    sweep_line.stopped->prev = e1;
--		sweep_line.stopped = e1;
--		e1->prev = NULL;
--	    }
-+	    if (e1->deferred.right != NULL)
-+		_cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
- 
- 	    if (left != NULL && right != NULL) {
- 		status = _cairo_bo_event_queue_insert_if_intersect_below_current_y (&event_queue, left, right);
-@@ -1420,10 +1359,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 	}
-     }
- 
--    for (e1 = sweep_line.stopped; e1; e1 = e1->next) {
--	if (e1->deferred.right != NULL)
--	    _cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
--    }
-  unwind:
-     _cairo_bo_event_queue_fini (&event_queue);
- 
-@@ -1447,6 +1382,12 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon,
-     if (unlikely (0 == num_events))
- 	return CAIRO_STATUS_SUCCESS;
- 
-+    if (DEBUG_POLYGON) {
-+	FILE *file = fopen ("reduce_in.txt", "w");
-+	_cairo_debug_print_polygon (file, polygon);
-+	fclose (file);
-+    }
-+
-     events = stack_events;
-     event_ptrs = stack_event_ptrs;
-     if (num_events > ARRAY_LENGTH (stack_events)) {
-@@ -1482,10 +1423,16 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon,
- 							 num_events,
- 							 fill_rule,
- 							 polygon);
--     polygon->num_limits = num_limits;
-+    polygon->num_limits = num_limits;
- 
-     if (events != stack_events)
- 	free (events);
- 
-+    if (DEBUG_POLYGON) {
-+	FILE *file = fopen ("reduce_out.txt", "w");
-+	_cairo_debug_print_polygon (file, polygon);
-+	fclose (file);
-+    }
-+
-     return status;
- }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/cairo/git_fixes.patch b/testing/cairo/git_fixes.patch
deleted file mode 100644
index 6ad8979eb..000000000
--- a/testing/cairo/git_fixes.patch
+++ /dev/null
@@ -1,1086 +0,0 @@
-From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Sun, 25 Mar 2012 18:37:14 +0000
-Subject: Fix math in comments
-
----
-diff --git a/src/cairo-arc.c b/src/cairo-arc.c
-index dc07fee..6977e88 100644
---- a/src/cairo-arc.c
-+++ b/src/cairo-arc.c
-@@ -139,7 +139,7 @@ _arc_segments_needed (double	      angle,
- 
-    From that paper, a very practical value of h is:
- 
--	h = 4/3 * tan(angle/4)
-+	h = 4/3 * R * tan(angle/4)
- 
-    This value does not give the spline with minimal error, but it does
-    provide a very good approximation, (6th-order convergence), and the
---
-cgit v0.9.0.2-2-gbebe
-From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Tue, 27 Mar 2012 21:25:37 +0000
-Subject: gl: use font's antialias option to check whether it needs mask
-
-There is need to loop over number of glyphs to check wether the glyph
-image is a ARGB32 as the font's antialias option can be used for checking.
-If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32,
-otherwise it will be A8 format. Therefore we will only be using
-component-alpha at SUBPIXEL (or better) font quality and only then need
-a mask for multiple pass glyph composition.
----
-diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
-index 832956f..9756ea4 100644
---- a/src/cairo-gl-glyphs.c
-+++ b/src/cairo-gl-glyphs.c
-@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void			*_dst,
- 
-     TRACE ((stderr, "%s\n", __FUNCTION__));
- 
--    /* If any of the glyphs are component alpha, we have to go through a mask,
--     * since only _cairo_gl_surface_composite() currently supports component
--     * alpha.
-+    /* If any of the glyphs require component alpha, we have to go through
-+     * a mask, since only _cairo_gl_surface_composite() currently supports
-+     * component alpha.
-      */
--    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER) {
--	for (i = 0; i < info->num_glyphs; i++) {
--	    cairo_scaled_glyph_t *scaled_glyph;
--
--	    if (_cairo_scaled_glyph_lookup (info->font, info->glyphs[i].index,
--					    CAIRO_SCALED_GLYPH_INFO_SURFACE,
--					    &scaled_glyph) == CAIRO_INT_STATUS_SUCCESS &&
--		scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32)
--	    {
--		info->use_mask = TRUE;
--		break;
--	    }
--	}
-+    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER &&
-+	(info->font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL ||
-+	 info->font->options.antialias == CAIRO_ANTIALIAS_BEST))
-+    {
-+	info->use_mask = TRUE;
-     }
- 
-     if (info->use_mask) {
---
-cgit v0.9.0.2-2-gbebe
-From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 28 Mar 2012 23:32:36 +0000
-Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask
-
-The SOURCE and CLEAR are the odd pair in Cairo's range of operators that
-are bound by the shape/mask, but are unbound by the source. This
-regularly leads to bugs as only track the bound/unbound rectangles and
-confuse the meaning when bound only by the mask.
-
-What is required is that the unbound extents in this case is only
-trimmed by the mask (the bounded extents are still the intersection of
-all).
-
-Fixes bug-source-cu
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c
-index 106571e..8c5cd5a 100644
---- a/src/cairo-composite-rectangles.c
-+++ b/src/cairo-composite-rectangles.c
-@@ -147,8 +147,12 @@ _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents,
-     if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK)
- 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
-     if (_cairo_clip_is_all_clipped (extents->clip))
-@@ -199,8 +203,12 @@ _cairo_composite_rectangles_intersect_source_extents (cairo_composite_rectangles
- 	rect.height == extents->bounded.height)
- 	return CAIRO_INT_STATUS_SUCCESS;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     clip = extents->clip;
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
-@@ -253,8 +261,12 @@ _cairo_composite_rectangles_intersect_mask_extents (cairo_composite_rectangles_t
- 	mask.height == extents->bounded.height)
- 	return CAIRO_INT_STATUS_SUCCESS;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     clip = extents->clip;
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
---
-cgit v0.9.0.2-2-gbebe
-From af6e084dd78fcbb8ecce46c57f655f5e24343b8c Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu, 29 Mar 2012 13:48:24 +0000
-Subject: cairoint: Mark PDF surface as requiring the deflate stream output
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairoint.h b/src/cairoint.h
-index 9a8003e..9f20d51 100644
---- a/src/cairoint.h
-+++ b/src/cairoint.h
-@@ -73,7 +73,10 @@
- #include "cairo-compiler-private.h"
- #include "cairo-error-private.h"
- 
--#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE
-+#if CAIRO_HAS_PDF_SURFACE    || \
-+    CAIRO_HAS_PS_SURFACE     || \
-+    CAIRO_HAS_SCRIPT_SURFACE || \
-+    CAIRO_HAS_XML_SURFACE
- #define CAIRO_HAS_DEFLATE_STREAM 1
- #endif
- 
-@@ -84,7 +87,9 @@
- #define CAIRO_HAS_FONT_SUBSET 1
- #endif
- 
--#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_FONT_SUBSET
-+#if CAIRO_HAS_PS_SURFACE  || \
-+    CAIRO_HAS_PDF_SURFACE || \
-+    CAIRO_HAS_FONT_SUBSET
- #define CAIRO_HAS_PDF_OPERATORS 1
- #endif
- 
---
-cgit v0.9.0.2-2-gbebe
-From a965b0f95fdeb567f7ccb51f7c8c47735a61e2d9 Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Thu, 29 Mar 2012 01:08:51 +0000
-Subject: gl: fix y-axis origin when map_to_image() for non texture GL surface
-
-We need to fix y-axis origin when map a GL surface to image surface for
-non-texture GL surface.
-
-Test cases: extended-blend-alpha-mask, extended-blend-mask.
-Although the image outputs is not right, but the image on the first grid
-(upper-left corner) is correct comparing to image output.
----
-diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
-index 8bbf939..32ecf63 100644
---- a/src/cairo-gl-surface.c
-+++ b/src/cairo-gl-surface.c
-@@ -985,6 +985,7 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
-     unsigned int cpp;
-     cairo_bool_t invert;
-     cairo_status_t status;
-+    int y;
- 
-     /* Want to use a switch statement here but the compiler gets whiny. */
-     if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) {
-@@ -1065,7 +1066,12 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
- 	glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp);
-     if (invert)
- 	glPixelStorei (GL_PACK_INVERT_MESA, 1);
--    glReadPixels (extents->x, extents->y,
-+
-+    y = extents->y;
-+    if (! _cairo_gl_surface_is_texture (surface))
-+	y = surface->height - extents->y - extents->height;
-+
-+    glReadPixels (extents->x, y,
- 		  extents->width, extents->height,
- 		  format, type, image->data);
-     if (invert)
---
-cgit v0.9.0.2-2-gbebe
-From c77112c5464d7ff21052527f82f4d729cc509291 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Mon, 02 Apr 2012 18:43:00 +0000
-Subject: xcb: Fix SHM in _get_image()
-
-Commit 2283ab9 introduced a logic error. Instead of falling back to the non-SHM
-path when getting the image via SHM failed, we now did the fallback when getting
-the image via SHM worked (which means that the SHM operation was a waste of
-time).
-
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
-index fff4f52..6bedbda 100644
---- a/src/cairo-xcb-surface.c
-+++ b/src/cairo-xcb-surface.c
-@@ -367,7 +367,7 @@ _get_image (cairo_xcb_surface_t		 *surface,
-     if (use_shm) {
- 	image = _get_shm_image (surface, x, y, width, height);
- 	if (image) {
--	    if (image->status) {
-+	    if (image->status == CAIRO_STATUS_SUCCESS) {
- 		_cairo_xcb_connection_release (connection);
- 		return image;
- 	    }
---
-cgit v0.9.0.2-2-gbebe
-From cc247c346b75353f16ab40ac74c54cdd9663d16b Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Mon, 02 Apr 2012 21:29:47 +0000
-Subject: gl: Remove an unused variable
-
----
-diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c
-index b364b92..ce7c0dd 100644
---- a/src/cairo-gl-gradient.c
-+++ b/src/cairo-gl-gradient.c
-@@ -207,7 +207,6 @@ _cairo_gl_gradient_create (cairo_gl_context_t           *ctx,
-     cairo_status_t status;
-     int tex_width;
-     void *data;
--    cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
- 
-     if ((unsigned int) ctx->max_texture_size / 2 <= n_stops)
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
---
-cgit v0.9.0.2-2-gbebe
-From 7a262fd398c8a1f3c9052e8d9ec459e27ff91b4d Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed, 04 Apr 2012 10:23:09 +0000
-Subject: fix bug in _cairo_image_analyze_color
-
----
-diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
-index 8208a15..e860e1b 100644
---- a/src/cairo-image-surface.c
-+++ b/src/cairo-image-surface.c
-@@ -1130,9 +1130,12 @@ _cairo_image_analyze_color (cairo_image_surface_t      *image)
-     if (image->color != CAIRO_IMAGE_UNKNOWN_COLOR)
- 	return image->color;
- 
--    if (image->format == CAIRO_FORMAT_A1 || image->format == CAIRO_FORMAT_A8)
-+    if (image->format == CAIRO_FORMAT_A1)
- 	return image->color = CAIRO_IMAGE_IS_MONOCHROME;
- 
-+    if (image->format == CAIRO_FORMAT_A8)
-+	return image->color = CAIRO_IMAGE_IS_GRAYSCALE;
-+
-     if (image->format == CAIRO_FORMAT_ARGB32) {
- 	image->color = CAIRO_IMAGE_IS_MONOCHROME;
- 	for (y = 0; y < image->height; y++) {
---
-cgit v0.9.0.2-2-gbebe
-From 70b2856ed3d31b41e69b3d82fb9c5c11c2b3d3d4 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 05 Apr 2012 23:43:35 +0000
-Subject: type1-subset: use fallback font if glyph widths are calculated
-
-Bug 48349 has a pdf file with a Type 1 font where the glyph widths are
-of the form:
-
-34 9302 19 div hsbw
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index 607ac8e..ba1008a 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -751,6 +751,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 	    command = *p++;
- 	    switch (command) {
- 		case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		     if (! last_op_was_integer)
-+			  return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
-@@ -797,6 +800,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 			    break;
- 
- 			case TYPE1_CHARSTRING_COMMAND_SBW:
-+			     if (! last_op_was_integer)
-+				  return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
- 			    font->build_stack.sp = 0;
- 			    last_op_was_integer = FALSE;
---
-cgit v0.9.0.2-2-gbebe
-From a6d955fcc46ae2da8d6f3b2cadeae64c03066461 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 05 Apr 2012 23:53:50 +0000
-Subject: fix indentation in cairo_type1_font_subset_parse_charstring
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index ba1008a..ddef8ae 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -1,3 +1,4 @@
-+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
- /* cairo - a vector graphics library with display and print output
-  *
-  * Copyright © 2006 Red Hat, Inc
-@@ -750,86 +751,79 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
-         if (*p < 32) {
- 	    command = *p++;
- 	    switch (command) {
--		case TYPE1_CHARSTRING_COMMAND_HSBW:
--		     if (! last_op_was_integer)
--			  return CAIRO_INT_STATUS_UNSUPPORTED;
-+	    case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		if (! last_op_was_integer)
-+		    return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
-+		font->build_stack.sp = 0;
-+		last_op_was_integer = FALSE;
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
-+		if (font->subset_subrs  &&
-+		    last_op_was_integer &&
-+		    font->build_stack.top_value >= 0    &&
-+		    font->build_stack.top_value < font->num_subrs)
-+		{
-+		    subr_num = font->build_stack.top_value;
-+		    font->subrs[subr_num].used = TRUE;
-+		    last_op_was_integer = FALSE;
-+		    status = cairo_type1_font_subset_parse_charstring (font,
-+								       glyph,
-+								       font->subrs[subr_num].subr_string,
-+								       font->subrs[subr_num].subr_length);
-+		} else {
-+		    font->subset_subrs = FALSE;
-+		}
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_ESCAPE:
-+		command = command << 8 | *p++;
-+		switch (command) {
-+		case TYPE1_CHARSTRING_COMMAND_SEAC:
-+		    /* The seac command takes five integer arguments.  The
-+		     * last two are glyph indices into the PS standard
-+		     * encoding give the names of the glyphs that this
-+		     * glyph is composed from.  All we need to do is to
-+		     * make sure those glyphs are present in the subset
-+		     * under their standard names. */
-+		    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
-+		    if (unlikely (status))
-+			return status;
-+
-+		    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
-+		    if (unlikely (status))
-+			return status;
- 
--		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
--		    if (font->subset_subrs  &&
--			last_op_was_integer &&
--			font->build_stack.top_value >= 0    &&
--			font->build_stack.top_value < font->num_subrs)
--		    {
--			subr_num = font->build_stack.top_value;
--			font->subrs[subr_num].used = TRUE;
--			last_op_was_integer = FALSE;
--			status = cairo_type1_font_subset_parse_charstring (font,
--									   glyph,
--									   font->subrs[subr_num].subr_string,
--									   font->subrs[subr_num].subr_length);
--		    } else {
--			font->subset_subrs = FALSE;
--		    }
-+		case TYPE1_CHARSTRING_COMMAND_SBW:
-+		    if (! last_op_was_integer)
-+			return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
-+		    font->build_stack.sp = 0;
-+		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_ESCAPE:
--		    command = command << 8 | *p++;
--		    switch (command) {
--			case TYPE1_CHARSTRING_COMMAND_SEAC:
--			    /* The seac command takes five integer arguments.  The
--			     * last two are glyph indices into the PS standard
--			     * encoding give the names of the glyphs that this
--			     * glyph is composed from.  All we need to do is to
--			     * make sure those glyphs are present in the subset
--			     * under their standard names. */
--			    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
--			    if (unlikely (status))
--				return status;
--
--			    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
--			    if (unlikely (status))
--				return status;
--
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_SBW:
--			     if (! last_op_was_integer)
--				  return CAIRO_INT_STATUS_UNSUPPORTED;
--
--			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
--			    for (i = 0; i < font->build_stack.sp; i++)
--				font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
--			    font->ps_stack.num_other_subr_args = font->build_stack.sp;
--			    font->ps_stack.cur_other_subr_arg = 0;
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_POP:
--			    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
--				font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
--				last_op_was_integer = TRUE;
--			    } else {
--				font->subset_subrs = FALSE;
--			    }
--			    break;
--
--			default:
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
-+		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
-+		    for (i = 0; i < font->build_stack.sp; i++)
-+			font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
-+		    font->ps_stack.num_other_subr_args = font->build_stack.sp;
-+		    font->ps_stack.cur_other_subr_arg = 0;
-+		    font->build_stack.sp = 0;
-+		    last_op_was_integer = FALSE;
-+		    break;
-+
-+		case TYPE1_CHARSTRING_COMMAND_POP:
-+		    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
-+			font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
-+			last_op_was_integer = TRUE;
-+		    } else {
-+			font->subset_subrs = FALSE;
- 		    }
- 		    break;
- 
-@@ -837,6 +831,13 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
- 		    break;
-+		}
-+		break;
-+
-+	    default:
-+		font->build_stack.sp = 0;
-+		last_op_was_integer = FALSE;
-+		break;
- 	    }
-         } else {
-             /* integer argument */
---
-cgit v0.9.0.2-2-gbebe
-From 8886220b5027296f5b3b95e9c2f93509108d3b9e Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 06 Apr 2012 00:13:53 +0000
-Subject: type1-subset: if font name is prefixed with a subset tag, strip it off
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index ddef8ae..e507abe 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -381,6 +381,7 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
- {
-     const char *start, *end, *segment_end;
-     char *s;
-+    int i;
- 
-     segment_end = font->header_segment + font->header_segment_size;
-     start = find_token (font->header_segment, segment_end, "/FontName");
-@@ -406,6 +407,16 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
-     }
- 
-+    /* If font name is prefixed with a subset tag, strip it off. */
-+    if (strlen(start) > 7 && start[6] == '+') {
-+	for (i = 0; i < 6; i++) {
-+	    if (start[i] < 'A' || start[i] > 'Z')
-+		break;
-+	}
-+	if (i == 6)
-+	    start += 7;
-+    }
-+
-     font->base.base_font = strdup (start);
-     free (s);
-     if (unlikely (font->base.base_font == NULL))
---
-cgit v0.9.0.2-2-gbebe
-From 8657ca10e34b0034602680b4304d47ecf90ccbfd Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 06 Apr 2012 11:50:40 +0000
-Subject: fix _cairo_pattern_get_ink_extents to work with snapshot recording surfaces
-
-It had caused pdf bbox sizes to regress to page size bboxes.
----
-diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
-index 27ba004..5b3e177 100644
---- a/src/cairo-pattern.c
-+++ b/src/cairo-pattern.c
-@@ -37,6 +37,7 @@
- #include "cairo-path-private.h"
- #include "cairo-pattern-private.h"
- #include "cairo-recording-surface-private.h"
-+#include "cairo-surface-snapshot-private.h"
- 
- #include <float.h>
- 
-@@ -3666,6 +3667,9 @@ _cairo_pattern_get_ink_extents (const cairo_pattern_t         *pattern,
- 	    (const cairo_surface_pattern_t *) pattern;
- 	cairo_surface_t *surface = surface_pattern->surface;
- 
-+	if (_cairo_surface_is_snapshot (surface))
-+	    surface = _cairo_surface_snapshot_get_target (surface);
-+
- 	if (_cairo_surface_is_recording (surface)) {
- 	    cairo_matrix_t imatrix;
- 	    cairo_box_t box;
---
-cgit v0.9.0.2-2-gbebe
-From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 08 Apr 2012 10:28:59 +0000
-Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes
-
-A typo using half_line_x instead of half_line_y when emitting dashed
-segments of the rectilinear stroke.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c
-index 3e8c5a4..cc9dd19 100644
---- a/src/cairo-path-stroke-boxes.c
-+++ b/src/cairo-path-stroke-boxes.c
-@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st
- 		    box.p1.x = box.p2.x - half_line_x;
- 		}
- 		if (out_slope.dy >= 0)
--		    box.p1.y -= half_line_x;
-+		    box.p1.y -= half_line_y;
- 		if (out_slope.dy <= 0)
--		    box.p2.y += half_line_x;
-+		    box.p2.y += half_line_y;
- 	    } else {
- 		if (box.p1.y <= box.p2.y) {
- 		    box.p1.y = box.p2.y;
--		    box.p2.y += half_line_x;
-+		    box.p2.y += half_line_y;
- 		} else {
--		    box.p1.y = box.p2.y - half_line_x;
-+		    box.p1.y = box.p2.y - half_line_y;
- 		}
- 		if (out_slope.dx >= 0)
- 		    box.p1.x -= half_line_x;
---
-cgit v0.9.0.2-2-gbebe
-From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 08 Apr 2012 16:58:13 +0000
-Subject: traps: Clip the trapezoid extents against the clip extents
-
-Just in case the clip polygon turns out to be much larger than the
-operation extents (silly us for not reducing it correctly) and lead to
-catastrophe, such as:
-
-Program received signal SIGSEGV, Segmentation fault.
-pixman_fill_sse2 (bits=<optimized out>, stride=4, bpp=8, x=0, y=0,
-width=3, height=-34811, data=0) at pixman-sse2.c:3369
-3369		    *(uint16_t *)d = data;
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c
-index 284a0be..c49e208 100644
---- a/src/cairo-traps-compositor.c
-+++ b/src/cairo-traps-compositor.c
-@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t *compositor,
-     _cairo_traps_fini (&traps);
-     cairo_surface_destroy (src);
- 
--    if (status == CAIRO_INT_STATUS_SUCCESS &&
--	(fixup.width < extents->width || fixup.height < extents->height)) {
-+    if (unlikely (status))
-+	return status;
-+
-+    if (! _cairo_rectangle_intersect (&fixup, extents))
-+	return CAIRO_STATUS_SUCCESS;
-+
-+    if (fixup.width < extents->width || fixup.height < extents->height) {
- 	cairo_boxes_t clear;
- 
- 	_cairo_boxes_init (&clear);
---
-cgit v0.9.0.2-2-gbebe
-From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 09 Apr 2012 11:47:34 +0000
-Subject: build: Disable -Wset-but-unused-variable
-
-This is too noisy in the current build, and masking more important
-warnings.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index 3eb0104..f1b17f4 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -21,6 +21,9 @@ MAYBE_WARN="-Wall -Wextra \
- -Wno-missing-field-initializers -Wno-unused-parameter \
- -Wno-attributes -Wno-long-long -Winline"
- 
-+# -Wunused-but-set-variable is too noisy at present
-+NO_WARN="-Wno-unused-but-set-variable"
-+
- dnl Sun Studio 12 likes to rag at us for abusing enums like
- dnl having cairo_status_t variables hold cairo_int_status_t
- dnl values.  It's bad, we know.  Now please be quiet.
-@@ -34,6 +37,8 @@ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
- dnl Also to turn various gcc/glibc-specific preprocessor checks
- MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
- 
-+MAYBE_WARN="$MAYBE_WARN $NO_WARN"
-+
- # invalidate cached value if MAYBE_WARN has changed
- if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
- 	unset cairo_cv_warn_cflags
---
-cgit v0.9.0.2-2-gbebe
-From 7cb5053c0694992320b5f7ea3b91ea497431813b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 09 Apr 2012 11:49:20 +0000
-Subject: analysis: Apply the integer translation to the bbox as well
-
-The bbox is used to compute the ink extents (and so the pattern extents
-of a recording surface) and if given an integer translation we failed to
-transform the bbox into the target space.
-
-Fixes mask (pdf).
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c
-index b8abe02..8878f62 100644
---- a/src/cairo-analysis-surface.c
-+++ b/src/cairo-analysis-surface.c
-@@ -220,6 +220,14 @@ _add_operation (cairo_analysis_surface_t *surface,
- 	if (_cairo_matrix_is_integer_translation (&surface->ctm, &tx, &ty)) {
- 	    rect->x += tx;
- 	    rect->y += ty;
-+
-+	    tx = _cairo_fixed_from_int (tx);
-+	    bbox.p1.x += tx;
-+	    bbox.p2.x += tx;
-+
-+	    ty = _cairo_fixed_from_int (ty);
-+	    bbox.p1.y += ty;
-+	    bbox.p2.y += ty;
- 	} else {
- 	    _cairo_matrix_transform_bounding_box_fixed (&surface->ctm,
- 							&bbox, NULL);
---
-cgit v0.9.0.2-2-gbebe
-From 038e4991912656a3239ca82d60056ca129016ba6 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon, 09 Apr 2012 08:31:44 +0000
-Subject: pdf: avoid unnecessary use of patterns in mask groups
-
----
-diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
-index 4930e72..78537ce 100644
---- a/src/cairo-pdf-surface.c
-+++ b/src/cairo-pdf-surface.c
-@@ -5703,56 +5703,68 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
-     if (unlikely (status))
- 	return status;
- 
--    pattern_res.id = 0;
--    gstate_res.id = 0;
--    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
--						 &pattern_res, &gstate_res);
--    if (unlikely (status))
--	return status;
--
--    if (gstate_res.id != 0) {
--	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
--	if (unlikely (smask_group == NULL))
--	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--	smask_group->width = group->width;
--	smask_group->height = group->height;
--	smask_group->operation = PDF_PAINT;
--	smask_group->source = cairo_pattern_reference (group->mask);
--	smask_group->source_res = pattern_res;
--	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
--	if (unlikely (status)) {
--	    _cairo_pdf_smask_group_destroy (smask_group);
--	    return status;
--	}
--
--	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
--	if (unlikely (status))
--	    return status;
--
--	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+    if (_can_paint_pattern (group->mask)) {
-+	_cairo_output_stream_printf (surface->output, "q\n");
-+	status = _cairo_pdf_surface_paint_pattern (surface,
-+						   group->mask,
-+						   &group->extents,
-+						   FALSE);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "q /s%d gs /x%d Do Q\n",
--				     gstate_res.id,
--				     smask_group->group_res.id);
-+	_cairo_output_stream_printf (surface->output, "Q\n");
-     } else {
--	status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
-+	pattern_res.id = 0;
-+	gstate_res.id = 0;
-+	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
-+						     &pattern_res, &gstate_res);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "%f %f %f %f re f\n",
--				     bbox.p1.x,
--				     bbox.p1.y,
--				     bbox.p2.x - bbox.p1.x,
--				     bbox.p2.y - bbox.p1.y);
-+	if (gstate_res.id != 0) {
-+	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
-+	    if (unlikely (smask_group == NULL))
-+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--	status = _cairo_pdf_surface_unselect_pattern (surface);
--	if (unlikely (status))
--	    return status;
-+	    smask_group->width = group->width;
-+	    smask_group->height = group->height;
-+	    smask_group->operation = PDF_PAINT;
-+	    smask_group->source = cairo_pattern_reference (group->mask);
-+	    smask_group->source_res = pattern_res;
-+	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
-+	    if (unlikely (status)) {
-+		_cairo_pdf_smask_group_destroy (smask_group);
-+		return status;
-+	    }
-+
-+	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "q /s%d gs /x%d Do Q\n",
-+					 gstate_res.id,
-+					 smask_group->group_res.id);
-+	} else {
-+	    status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "%f %f %f %f re f\n",
-+					 bbox.p1.x,
-+					 bbox.p1.y,
-+					 bbox.p2.x - bbox.p1.x,
-+					 bbox.p2.y - bbox.p1.y);
-+
-+	    status = _cairo_pdf_surface_unselect_pattern (surface);
-+	    if (unlikely (status))
-+		return status;
-+	}
-     }
- 
-     status = _cairo_pdf_surface_close_group (surface, &mask_group);
-@@ -5764,54 +5776,66 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
-     if (unlikely (status))
- 	return status;
- 
--    pattern_res.id = 0;
--    gstate_res.id = 0;
--    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
--						 &pattern_res, &gstate_res);
--    if (unlikely (status))
--	return status;
--
--    if (gstate_res.id != 0) {
--	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
--	if (unlikely (smask_group == NULL))
--	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--	smask_group->operation = PDF_PAINT;
--	smask_group->source = cairo_pattern_reference (group->source);
--	smask_group->source_res = pattern_res;
--	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
--	if (unlikely (status)) {
--	    _cairo_pdf_smask_group_destroy (smask_group);
--	    return status;
--	}
--
--	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
--	if (unlikely (status))
--	    return status;
--
--	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+    if (_can_paint_pattern (group->source)) {
-+	_cairo_output_stream_printf (surface->output, "q\n");
-+	status = _cairo_pdf_surface_paint_pattern (surface,
-+						   group->source,
-+						   &group->extents,
-+						   FALSE);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "q /s%d gs /x%d Do Q\n",
--				     gstate_res.id,
--				     smask_group->group_res.id);
-+	_cairo_output_stream_printf (surface->output, "Q\n");
-     } else {
--	status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
-+	pattern_res.id = 0;
-+	gstate_res.id = 0;
-+	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
-+						     &pattern_res, &gstate_res);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "%f %f %f %f re f\n",
--				     bbox.p1.x,
--				     bbox.p1.y,
--				     bbox.p2.x - bbox.p1.x,
--				     bbox.p2.y - bbox.p1.y);
-+	if (gstate_res.id != 0) {
-+	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
-+	    if (unlikely (smask_group == NULL))
-+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--	status = _cairo_pdf_surface_unselect_pattern (surface);
--	if (unlikely (status))
--	    return status;
-+	    smask_group->operation = PDF_PAINT;
-+	    smask_group->source = cairo_pattern_reference (group->source);
-+	    smask_group->source_res = pattern_res;
-+	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
-+	    if (unlikely (status)) {
-+		_cairo_pdf_smask_group_destroy (smask_group);
-+		return status;
-+	    }
-+
-+	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "q /s%d gs /x%d Do Q\n",
-+					 gstate_res.id,
-+					 smask_group->group_res.id);
-+	} else {
-+	    status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "%f %f %f %f re f\n",
-+					 bbox.p1.x,
-+					 bbox.p1.y,
-+					 bbox.p2.x - bbox.p1.x,
-+					 bbox.p2.y - bbox.p1.y);
-+
-+	    status = _cairo_pdf_surface_unselect_pattern (surface);
-+	    if (unlikely (status))
-+		return status;
-+	}
-     }
- 
-     status = _cairo_pdf_surface_close_group (surface, NULL);
---
-cgit v0.9.0.2-2-gbebe
-From 9fcbe25c2dcf831783bb0fd20af9754c0b5c409b Mon Sep 17 00:00:00 2001
-From: Maarten Bosmans <mkbosmans@gmail.com>
-Date: Mon, 09 Apr 2012 19:33:50 +0000
-Subject: Protect code using dlfcn.h with CAIRO_HAS_DLSYM
-
----
-diff --git a/configure.ac b/configure.ac
-index cedfebe..5d2e6ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes")
- if test "x$have_dlsym" = "xyes"; then
-   AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available])
- fi
-+AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes")
- 
- dnl ===========================================================================
- 
-diff --git a/util/Makefile.am b/util/Makefile.am
-index f202f35..82d0a80 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -12,20 +12,24 @@ endif
- 
- if CAIRO_HAS_TRACE
- SUBDIRS += cairo-trace
-+if CAIRO_HAS_DLSYM
- if CAIRO_HAS_SCRIPT_SURFACE
- if CAIRO_HAS_TEE_SURFACE
- SUBDIRS += cairo-fdr
- endif
- endif
- endif
-+endif
- 
- if BUILD_SPHINX
-+if CAIRO_HAS_DLSYM
- if CAIRO_HAS_SCRIPT_SURFACE
- if CAIRO_HAS_TEE_SURFACE
- SUBDIRS += cairo-sphinx
- endif
- endif
- endif
-+endif
- 
- AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_builddir)/src \
---
-cgit v0.9.0.2-2-gbebe
-From c7b86ab97be1d3d3ccf43b652832f148a2fcf290 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue, 10 Apr 2012 13:04:05 +0000
-Subject: any2ppm: fix missing enumeration warning
-
----
-diff --git a/test/any2ppm.c b/test/any2ppm.c
-index 6b61c47..2403347 100644
---- a/test/any2ppm.c
-+++ b/test/any2ppm.c
-@@ -193,6 +193,7 @@ write_ppm (cairo_surface_t *surface, int fd)
- 	break;
-     case CAIRO_FORMAT_A1:
-     case CAIRO_FORMAT_RGB16_565:
-+    case CAIRO_FORMAT_RGB30:
-     case CAIRO_FORMAT_INVALID:
-     default:
- 	return "unhandled image format";
---
-cgit v0.9.0.2-2-gbebe
-From 09de481ce5f6ed1c38c0d5bf3af7c60642c4c947 Mon Sep 17 00:00:00 2001
-From: Gilles Espinasse <g.esp@free.fr>
-Date: Sat, 07 Apr 2012 21:09:51 +0000
-Subject: Cosmetic configure fix
-
-'how to allow undefined symbols in shared libraries' test should use CAIRO_CC_TRY_FLAG_SILENT or configure display is a bit out of order like this
-
-checking how to allow undefined symbols in shared libraries used by test suite... checking whether gcc supports -Wl,--allow-shlib-undefined... yes
--Wl,--allow-shlib-undefined
-
-Signed-off-by: Gilles Espinasse <g.esp@free.fr>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index f1b17f4..3b2c6f3 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result],
- 
- dnl check linker flags
- AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags,
--	       [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [],
-+	       [CAIRO_CC_TRY_FLAG_SILENT([-Wl,--allow-shlib-undefined], [],
- 				  [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")])
- CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags"
- AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS)
---
-cgit v0.9.0.2-2-gbebe
-From 07fc63676dfdaa57ed919ad7be8f59c97c615473 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Wed, 11 Apr 2012 19:37:55 +0000
-Subject: xlib: Disable fallback compositor with xlib-xcb
-
-When xlib-xcb is enabled, this is just dead code which is never used. Thus, this
-shouldn't hurt. However, this does include cairo-xlib-private.h. Shouldn't be a
-problem? Well, that header contains static inline functions which some compiler
-on Solaris will emit even when they are unused.
-
-This brings us to the real problem: That static inline function refers to a
-function which isn't compiled with xlib-xcb and thus linking fails with
-undefined symbols.
-
-This can be reproduced with GCC by adding a call to
-_cairo_xlib_screen_put_gc(NULL, NULL, 0, 0); to
-_cairo_xlib_fallback_compositor_get.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48489
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/src/cairo-xlib-fallback-compositor.c b/src/cairo-xlib-fallback-compositor.c
-index 5391926..7d45cd1 100644
---- a/src/cairo-xlib-fallback-compositor.c
-+++ b/src/cairo-xlib-fallback-compositor.c
-@@ -42,6 +42,8 @@
- 
- #include "cairoint.h"
- 
-+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
-+
- #include "cairo-xlib-private.h"
- 
- #include "cairo-compositor-private.h"
-@@ -52,3 +54,5 @@ _cairo_xlib_fallback_compositor_get (void)
-     /* XXX Do something interesting here to mitigate fallbacks ala xcb */
-     return &_cairo_fallback_compositor;
- }
-+
-+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/calligra/PKGBUILD b/testing/calligra/PKGBUILD
deleted file mode 100644
index b13b0e265..000000000
--- a/testing/calligra/PKGBUILD
+++ /dev/null
@@ -1,221 +0,0 @@
-# $Id: PKGBUILD 169630 2012-10-25 01:34:49Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=calligra
-pkgname=('calligra-filters'
-         'calligra-libs'
-         'calligra-plugins'
-         'calligra-tools'
-         'calligra-karbon'
-         'calligra-kexi'
-         'calligra-plan'
-         'calligra-stage'
-         'calligra-krita'
-         'calligra-sheets'
-         'calligra-words'
-         'calligra-handbook'
-         'calligra-braindump'
-         'calligra-flow')
-pkgver=2.5.3
-pkgrel=6
-arch=('i686' 'x86_64')
-url='http://www.calligra-suite.org/'
-license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
-             'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg'
-             'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
-groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('83e2679b7ecb923b953ace06db7ca4c2')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_active=OFF
-  make
-}
-
-package_calligra-filters() {
-  pkgdesc="Filters for the Calligra office suite"
-  optdepends=('libwpg: Corel WordPerfect Graphics image importer'
-              'libwps: Microsoft Works file word processor format import')
-  conflicts=('koffice-filters')
-  replaces=('koffice-filters')
-  install=calligra-filters.install
-
-  cd "${srcdir}"/build/filters
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-libs() {
-  pkgdesc="Libraries for the Calligra office suite"
-  depends=('kdepimlibs' 'lcms2')
-  conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
-             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
-             'calligra-templates')
-  replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
-             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
-             'calligra-templates')
-
-  for d in interfaces libs pics servicetypes templates; do
-    cd "${srcdir}"/build/${d}
-    make DESTDIR="${pkgdir}" install
-  done
-}
-
-package_calligra-plugins() {
-  pkgdesc="Plugins for the Calligra office suite"
-  depends=('calligra-libs' 'calligra-filters')
-  optdepends=('kdeedu-marble: map shape for Calligra')
-  conflicts=('koffice-plugins' 'koffice-kchart')
-  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
-
-  cd "${srcdir}"/build/plugins
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-tools() {
-  pkgdesc="Tools for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-tools')
-  replaces=('koffice-tools')
-  install=calligra-tools.install
-
-  cd "${srcdir}"/build/tools
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-karbon() {
-  pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs' 'kdebase-runtime' 'pstoedit')
-  optdepends=('calligra-filters: import/export filters'
-              'calligra-tools: extra calligra tools')
-  conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
-  replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
-  install=calligra-karbon.install
-
-  cd "${srcdir}"/build/karbon
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-kexi() {
-  pkgdesc="Develop desktop database applications"
-  depends=('calligra-libs' 'glew' 'fftw')
-  optdepends=('libmysqlclient: MySQL driver'
-              'libpqxx: PostgreSQL driver'
-              'freetds: Sybase & MS SQL driver'
-              'xbase: XBase driver'
-              'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
-              'kdeedu-marble: map form widget'
-              'calligra-plugins: extra calligra plugins')
-  conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
-  replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
-  install=calligra-kexi.install
-
-  cd "${srcdir}"/build/kexi
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc/kexi
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-plan() {
-  pkgdesc="Calligra Project Management Component"
-  depends=('calligra-words')
-  conflicts=('koffice-kplato' 'calligra-kplato')
-  replaces=('koffice-kplato' 'calligra-kplato')
-  install=calligra-plan.install
-
-  cd "${srcdir}"/build/plan
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-stage() {
-  pkgdesc="Write presentation documents"
-  depends=('calligra-libs' 'kdebase-runtime')
-  optdepends=('calligra-plugins: extra calligra plugins')
-  conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
-  replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
-  install=calligra-stage.install
-
-  cd "${srcdir}"/build/stage
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc/stage
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-krita() {
-  pkgdesc="Edit and paint images"
-  depends=('calligra-plugins' 'kdebase-runtime' 'eigen2'
-           'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl')
-  conflicts=('koffice-krita' 'calligra-krita-doc')
-  replaces=('koffice-krita' 'calligra-krita-doc')
-  install=calligra-krita.install
-
-  cd "${srcdir}"/build/krita
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-sheets() {
-  pkgdesc="Write spreadsheet documents"
-  depends=('calligra-libs' 'gsl' 'kdebase-runtime')
-  optdepends=('calligra-filters: import/export filters'
-              'calligra-plugins: extra calligra plugins'
-              'calligra-tools: extra calligra tools')
-  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  install=calligra-sheets.install
-
-  cd "${srcdir}"/build/sheets
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc/sheets
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-words() {
-  pkgdesc="Word Processor"
-  depends=('calligra-libs' 'kdegraphics-okular')
-  optdepends=('calligra-tools: extra calligra tools')
-  conflicts=('koffice-kword')
-  replaces=('koffice-kword')
-  install=calligra-words.install
-
-  cd "${srcdir}"/build/words
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-handbook() {
-  pkgdesc="Documentation for Calligra"
-  conflicts=('koffice-handbook')
-  replaces=('koffice-handbook')
-  options=('docs')
-
-  cd "${srcdir}"/build/doc/calligra
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-braindump() {
-  pkgdesc="Notes and idea gathering"
-  depends=('calligra-libs' 'kdebase-runtime')
-  install=calligra-braindump.install
-
-  cd "${srcdir}"/build/braindump
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-flow() {
-  pkgdesc="Flowchart & Diagram Editing"
-  depends=('calligra-words')
-  conflicts=('calligra-flow-doc')
-  replaces=('calligra-flow-doc')
-  install=calligra-flow.install
-
-  cd "${srcdir}"/build/flow
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/calligra/calligra-braindump.install b/testing/calligra/calligra-braindump.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/testing/calligra/calligra-braindump.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/testing/calligra/calligra-filters.install b/testing/calligra/calligra-filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/testing/calligra/calligra-filters.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/calligra/calligra-flow.install b/testing/calligra/calligra-flow.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/calligra/calligra-flow.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/calligra/calligra-karbon.install b/testing/calligra/calligra-karbon.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/testing/calligra/calligra-karbon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/testing/calligra/calligra-kexi.install b/testing/calligra/calligra-kexi.install
deleted file mode 100644
index b8c7ebf27..000000000
--- a/testing/calligra/calligra-kexi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/calligra/calligra-krita.install b/testing/calligra/calligra-krita.install
deleted file mode 100644
index 33d234a02..000000000
--- a/testing/calligra/calligra-krita.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/testing/calligra/calligra-plan.install b/testing/calligra/calligra-plan.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/testing/calligra/calligra-plan.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/testing/calligra/calligra-sheets.install b/testing/calligra/calligra-sheets.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/calligra/calligra-sheets.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/calligra/calligra-stage.install b/testing/calligra/calligra-stage.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/calligra/calligra-stage.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/calligra/calligra-tools.install b/testing/calligra/calligra-tools.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/calligra/calligra-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/calligra/calligra-words.install b/testing/calligra/calligra-words.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/calligra/calligra-words.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/calligra/calligra.install b/testing/calligra/calligra.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/calligra/calligra.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/celestia/PKGBUILD b/testing/celestia/PKGBUILD
deleted file mode 100644
index 492b6565b..000000000
--- a/testing/celestia/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 168482 2012-10-12 16:54:10Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=celestia
-pkgver=1.6.1
-pkgrel=3
-pkgdesc="Real-time space simulation"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.shatters.net/celestia/"
-depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
-        'celestia-1.6.1-gcc46.patch' 
-        'celestia-1.6.1-libpng15.patch'
-        'celestia-1.6.1-linking.patch'
-        'gcc-4.7-fixes.diff')
-sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
-          '7c08ca391603806d788cb8f3342acedafc924eef'
-          '46ecc4e10b24191384bc848c206652498843adf0'
-          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
-          '582f9eed93eca02a16350f02c29e2ea6f69aa869')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    # build patch
-    patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
-    patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
-    patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
-    patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff"
-
-    # This version of Celestia has a bug in the font rendering and requires -fsigned-char 
-    export CFLAGS="$CFLAGS -fsigned-char"
-    export CXXFLAGS="$CXXFLAGS -fsigned-char"
-
-    autoreconf
-    ./configure --prefix=/usr \
-                --with-lua=/usr \
-		--datadir=/usr/share \
-                --with-gtk \
-                --disable-rpath \
-                --with-lua
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    make DESTDIR=${pkgdir} install
-}
-
diff --git a/testing/celestia/celestia-1.5.1-gcc44.patch b/testing/celestia/celestia-1.5.1-gcc44.patch
deleted file mode 100644
index b1ee896f0..000000000
--- a/testing/celestia/celestia-1.5.1-gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/celengine/overlay.h.orig	2009-07-08 02:27:08.000000000 -0400
-+++ src/celengine/overlay.h	2009-07-08 02:27:28.000000000 -0400
-@@ -10,6 +10,7 @@
- #ifndef _OVERLAY_H_
- #define _OVERLAY_H_
- 
-+#include <cstdio>
- #include <string>
- #include <iostream>
- #include <celtxf/texturefont.h>
---- src/celengine/star.cpp.orig	2009-07-08 02:40:52.000000000 -0400
-+++ src/celengine/star.cpp	2009-07-08 02:41:08.000000000 -0400
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
- 
- #include <celmath/mathlib.h>
-+#include <cstdio>
- #include <cstring>
- #include <cassert>
- #include "celestia.h"
diff --git a/testing/celestia/celestia-1.6.1-gcc46.patch b/testing/celestia/celestia-1.6.1-gcc46.patch
deleted file mode 100644
index ddf4036f2..000000000
--- a/testing/celestia/celestia-1.6.1-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=366073
-
-Patch written by Nils Larsson <ni1s@nerdshack.com>
---- src/celengine/frametree.h
-+++ src/celengine/frametree.h
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
- 
- #include <vector>
-+#include <cstddef>
- 
- class Star;
- class Body;
diff --git a/testing/celestia/celestia-1.6.1-gentoo.patch b/testing/celestia/celestia-1.6.1-gentoo.patch
deleted file mode 100644
index 57fffe159..000000000
--- a/testing/celestia/celestia-1.6.1-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/celestia/Makefile.am	2011-06-07 19:15:51.502000147 +0200
-+++ src/celestia/Makefile.am.new	2011-06-07 19:15:47.208000302 +0200
-@@ -15,6 +15,7 @@
- if ENABLE_GTK
- SUBDIRS += gtk
- celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
-
-Index: src/celengine/frametree.h
-===================================================================
---- src/celengine/frametree.h	(revision 5163)
-+++ src/celengine/frametree.h	(arbetskopia)
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
- 
- #include <vector>
-+#include <cstddef>
- 
- class Star;
- class Body;
diff --git a/testing/celestia/celestia-1.6.1-libpng15.patch b/testing/celestia/celestia-1.6.1-libpng15.patch
deleted file mode 100644
index 5dffbab24..000000000
--- a/testing/celestia/celestia-1.6.1-libpng15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
-
---- src/celestia/imagecapture.cpp
-+++ src/celestia/imagecapture.cpp
-@@ -31,6 +31,9 @@
- #include "png.h"
- #endif
- 
-+// Z_BEST_COMPRESSION
-+#include <zlib.h>
-+
- // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
- #ifndef png_jmpbuf
- #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/testing/celestia/celestia-1.6.1-linking.patch b/testing/celestia/celestia-1.6.1-linking.patch
deleted file mode 100644
index d610d5243..000000000
--- a/testing/celestia/celestia-1.6.1-linking.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix linking issues:
- * underlinking GLUT (bug #372123, #387609)
- * as-needed (bug #281258)
-
---- a/src/celestia/Makefile.am
-+++ b/src/celestia/Makefile.am
-@@ -7,14 +7,15 @@
- 
- if ENABLE_KDE
- SUBDIRS += kde
--celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
--                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
-+celestiaKDELIBS = kde/libkdegui.a
- celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
- endif
- 
- if ENABLE_GTK
- SUBDIRS += gtk
--celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+celestiaGTKLIBS = gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
-@@ -62,6 +63,7 @@
- 
- if ENABLE_GLUT
- GLUTSOURCES = glutmain.cpp
-+GLUTLIBS = -lGL
- endif
- 
- if ENABLE_THEORA
-@@ -80,15 +82,16 @@
- celestia_LDADD = \
- 	$(celestiaKDELIBS) \
- 	$(celestiaGTKLIBS) \
--	$(DL_LIBS) \
--	$(LUA_LIBS) \
--	$(THEORA_LIBS) \
- 	../celengine/libcelengine.a \
- 	../celtxf/libceltxf.a \
- 	../cel3ds/libcel3ds.a \
- 	../celmath/libcelmath.a \
- 	../celutil/libcelutil.a \
--	$(SPICE_LIBS)
-+	$(LUA_LIBS) \
-+	$(THEORA_LIBS) \
-+	$(GLUTLIBS) \
-+	$(SPICE_LIBS) \
-+	$(DL_LIBS)
- 
- noinst_HEADERS = $(wildcard *.h)
- noinst_DATA = ../../celestia
diff --git a/testing/celestia/gcc-4.7-fixes.diff b/testing/celestia/gcc-4.7-fixes.diff
deleted file mode 100644
index 9ca09e03f..000000000
--- a/testing/celestia/gcc-4.7-fixes.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/celmath/intersect.h
-+++ b/src/celmath/intersect.h
-@@ -15,6 +15,7 @@
- #include "ray.h"
- #include "sphere.h"
- #include "ellipsoid.h"
-+#include "mathlib.h"
- 
- 
- template<class T> bool testIntersection(const Ray3<T>& ray,
diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD
deleted file mode 100644
index eecdebb6a..000000000
--- a/testing/cheese/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169270 2012-10-18 19:29:27Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cheese
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto')
-optdepends=('nautilus-sendto: Send snapshots'
-            'frei0r-plugins: More camera effects')
-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=('2db101cd16ce41764eb2f676c1bed94e58e4a89141785b95ff088b60bcf6abef')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/cheese/cheese.install b/testing/cheese/cheese.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/testing/cheese/cheese.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/cinepaint/LICENSE b/testing/cinepaint/LICENSE
deleted file mode 100644
index 746207229..000000000
--- a/testing/cinepaint/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2005, Kai-Uwe Behrmann
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.ntributors may be used to endorse or promote
-    products derived from this software without specific prior written
-    permission. 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/testing/cinepaint/PKGBUILD b/testing/cinepaint/PKGBUILD
deleted file mode 100644
index 3dea42c8a..000000000
--- a/testing/cinepaint/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 169631 2012-10-25 01:34:53Z eric $
-# Maintainer: tobias [tobias.archlinux.org]
-# Contributor: tobias [tobias.justdreams.de]
-
-pkgname=cinepaint
-pkgver=1.3
-pkgrel=5
-pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
-arch=('i686' 'x86_64')
-license=('LGPL' 'GPL' 'MIT')
-url="http://www.cinepaint.org"
-depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
-makedepends=('python2' 'gutenprint>=5.2.9')
-optdepends=('python2: for python plug-ins' 
-            'gutenprint: for print plug-ins'
-            'ghostscript: for pdf plug-ins')
-options=('!libtool')
-install=cinepaint.install
-source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz
-        LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch)
-sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b'
-          'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e'
-          '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5'
-          'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p1 -i ../cinepaint-libpng15.patch
-  patch -p1 -i ../cinepaint-missing-include.patch
-  find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
-
-#  aclocal -I aclocal
-#  autoconf
-  sh autogen.sh
-  
-  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
-    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
-  sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
-    plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install
-  sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
-    -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
-  sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/cinepaint/cinepaint-libpng15.patch b/testing/cinepaint/cinepaint-libpng15.patch
deleted file mode 100644
index e22edafae..000000000
--- a/testing/cinepaint/cinepaint-libpng15.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
---- cinepaint.old/plug-ins/png/png.c	2012-01-23 12:39:42.000000000 -0500
-+++ cinepaint/plug-ins/png/png.c	2012-01-23 12:39:50.000000000 -0500
-@@ -390,6 +390,16 @@
-   gchar		*progress;	/* Title for progress display... */
-   guchar	alpha[256],	/* Index -> Alpha */
-   		*alpha_ptr;	/* Temporary pointer */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  int compression_type;
-+  png_bytepp iccp_profile;
-+  png_uint_32 iccp_proflen;
-+  png_uint_32 width, height;
-+  png_byte channels;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -405,7 +415,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. File corrupted?", filename);
-     return image;
-@@ -442,21 +452,26 @@
-   */
- 
-   png_read_info(pp, info);
-+  color_type = png_get_color_type(pp, info);
-+  width=png_get_image_width(pp, info);
-+  height=png_get_image_height(pp, info);
- 
-  /*
-   * Latest attempt, this should be my best yet :)
-   */
- 
-+  bit_depth = png_get_bit_depth(pp, info);
-+
- #ifndef WORDS_BIGENDIAN
--  if(info->bit_depth == 16)
-+  if(bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
- 
--  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-     png_set_expand(pp);
-   }
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
-     png_set_packing(pp);
-   }
- 
-@@ -464,8 +479,8 @@
-   * Expand G+tRNS to GA, RGB+tRNS to RGBA
-   */
- 
--  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
--                       (info->valid & PNG_INFO_tRNS)) {
-+  if (color_type != PNG_COLOR_TYPE_PALETTE &&
-+      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
-     png_set_expand(pp);
-   }
- 
-@@ -482,7 +497,7 @@
- 
- #if PNG_LIBPNG_VER > 99
-   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
--      info->color_type == PNG_COLOR_TYPE_PALETTE)
-+      color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
-     /* Copy the existing alpha values from the tRNS chunk */
-@@ -505,9 +520,9 @@
- 
-   png_read_update_info(pp, info);
-   
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 6;
-@@ -545,7 +560,7 @@
-   }
-   else
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 3;
-@@ -582,7 +597,7 @@
- 	  };
-   }
- 
--  image = gimp_image_new(info->width, info->height, image_type);
-+  image = gimp_image_new(width, height, image_type);
-   if (image == -1)
-   {
-     g_message("Can't allocate new image\n%s", filename);
-@@ -595,7 +610,7 @@
-   * Create the "background" layer to hold the image...
-   */
- 
--  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
-+  layer = gimp_layer_new(image, _("Background"), width, height,
-                          layer_type, 100, NORMAL_MODE);
-   gimp_image_add_layer(image, layer, 0);
- 
-@@ -627,20 +642,21 @@
- 
-   empty= 0; /* by default assume no full transparent palette entries */
- 
--  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
-+  if (color_type & PNG_COLOR_MASK_PALETTE) {
- 
- #if PNG_LIBPNG_VER > 99
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
-         /* Calculates number of fully transparent "empty" entries */
- 
--      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
--                          info->num_palette - empty);
-+      gimp_image_set_cmap(image, (guchar *) (palette + empty),
-+                          num_palette - empty);
-     } else {
--      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
-     }
- #else
--    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
- #endif /* PNG_LIBPNG_VER > 99 */
- 
-   }
-@@ -659,18 +675,19 @@
-   */
- 
-   tile_height = gimp_tile_height ();
--  pixel       = g_new(guchar, tile_height * info->width * bpp);
-+  pixel       = g_new(guchar, tile_height * width * bpp);
-   pixels      = g_new(guchar *, tile_height);
-+  channels=png_get_channels(pp, info);
- 
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i * 2;
-+		  pixels[i] = pixel + width * channels * i * 2;
-   }
-   else
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i;
-+		  pixels[i] = pixel + width * channels * i;
-   }
- 
-   for (pass = 0; pass < num_passes; pass ++)
-@@ -680,11 +697,11 @@
- 	   */
- 
- 	  for (begin = 0, end = tile_height;
--			  begin < info->height;
-+			  begin < height;
- 			  begin += tile_height, end += tile_height)
- 	  {
--		  if (end > info->height)
--			  end = info->height;
-+		  if (end > height)
-+			  end = height;
- 
- 		  num = end - begin;
- 
-@@ -697,20 +714,21 @@
- 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
- 				  drawable->width, num);
- 
--		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
-+		  gimp_progress_update(((double)pass + (double)end / (double)height) /
- 				  (double)num_passes);
- 	  };
-   };
- 
- #if defined(PNG_iCCP_SUPPORTED)
-   /* set icc profile */
--  if (info->iccp_proflen > 0) {
--    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
--                                              info->iccp_profile,
--                                              ICC_IMAGE_PROFILE);
-+  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
-+  if (iccp_proflen > 0) {
-+    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
-+				       (gchar *)iccp_profile,
-+				       ICC_IMAGE_PROFILE);
-     printf ("%s:%d %s() set embedded profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -808,6 +826,14 @@
-                 blue;           /* Used for palette background */
-   time_t	cutime;         /* Time since epoch */
-   struct tm	*gmt;		/* GMT broken down */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  int filter_method=0;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  png_uint_32 height;
-+  int compression_type;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -824,7 +849,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. Couldn't save image", filename);
-     return 0;
-@@ -857,15 +882,6 @@
-   drawable = gimp_drawable_get (drawable_ID);
-   type     = gimp_drawable_type (drawable_ID);
- 
-- /*
--  * Set the image dimensions, bit depth, interlacing and compression
--  */
--
--  png_set_compression_level (pp, pngvals.compression_level);
--
--  info->width          = drawable->width;
--  info->height         = drawable->height;
--  info->interlace_type = pngvals.interlaced;
- 
-  /*
-   * Set color type and remember bytes per pixel count 
-@@ -874,71 +890,69 @@
-   switch (type)
-   {
-     case RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 8;
-         bpp              = 3;
-         break;
-     case RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 4;
-         break;
-     case GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 8;
-         bpp              = 1;
-         break;
-     case GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 2;
-         break;
-     case INDEXED_IMAGE :
- 	bpp		 = 1;
--	info->bit_depth      = 8;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case INDEXEDA_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 8;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 8;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     case U16_RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 16;
-         bpp              = 6;
-         break;
-     case U16_RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 8;
-         break;
-     case U16_GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 16;
-         bpp              = 2;
-         break;
-     case U16_GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 4;
-         break;
-     case U16_INDEXED_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 16;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case U16_INDEXEDA_IMAGE :
- 	bpp		 = 4;
--	info->bit_depth      = 16;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 16;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     default:
-@@ -950,30 +964,36 @@
-   * Fix bit depths for (possibly) smaller colormap images
-   */
-   
--  if (info->valid & PNG_INFO_PLTE) {
--    if (info->num_palette <= 2)
--      info->bit_depth= 1;
--    else if (info->num_palette <= 4)
--      info->bit_depth= 2;
--    else if (info->num_palette <= 16)
--      info->bit_depth= 4;
-+  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-+    if (num_palette <= 2)
-+      bit_depth= 1;
-+    else if (num_palette <= 4)
-+      bit_depth= 2;
-+    else if (num_palette <= 16)
-+      bit_depth= 4;
-     /* otherwise the default is fine */
-   }
- 
-+ png_set_compression_level (pp, pngvals.compression_level);
-+ png_set_IHDR(pp, info, drawable->width, drawable->height,
-+	      bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
-+
-+
-   // write icc profile
- #if defined(PNG_iCCP_SUPPORTED)
-   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
--    int size;
-+    int  size;
-     char *buffer;
-     
-     buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
-                                                 ICC_IMAGE_PROFILE);
-     png_set_iCCP (pp, info,
-            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
--                  0, buffer, size);
-+                  0, (png_const_bytep)buffer, size);
-     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -1039,13 +1059,13 @@
-   * Convert unpacked pixels to packed if necessary
-   */
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
-     png_set_packing(pp);
- 
-   /* Set swapping for 16 bit per sample images */
-   
- #ifndef WORDS_BIGENDIAN
--  if (info->bit_depth == 16)
-+  if (bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
-   
-@@ -1063,6 +1083,7 @@
- 
-   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
-                       drawable->height, FALSE, FALSE);
-+  height=png_get_image_height(pp, info);
- 
-   for (pass = 0; pass < num_passes; pass ++)
-   {
-@@ -1077,7 +1098,7 @@
- 	num = end - begin;
- 	
- 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
--        if (info->valid & PNG_INFO_tRNS) {
-+        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1085,7 +1106,7 @@
-             }
-           }
-        /* Forgot this case before, what if there are too many colors? */
--        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
-+        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1095,9 +1116,8 @@
-         }
- 	
- 	png_write_rows (pp, pixels, num);
--	
- 	gimp_progress_update (((double)pass + (double)end /
--                    (double)info->height) / (double)num_passes);
-+                    (double)height) / (double)num_passes);
-       };
-   };
- 
diff --git a/testing/cinepaint/cinepaint-missing-include.patch b/testing/cinepaint/cinepaint-missing-include.patch
deleted file mode 100644
index ed159213a..000000000
--- a/testing/cinepaint/cinepaint-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
---- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:51:10.625503826 -0400
-+++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:52:04.478835055 -0400
-@@ -32,6 +32,7 @@
- 
- #include <list>
- #include <string>
-+#include <unistd.h>
- 
- #include "icc_modell_beobachter.h"
- 
diff --git a/testing/cinepaint/cinepaint.install b/testing/cinepaint/cinepaint.install
deleted file mode 100644
index 5e5cfef4d..000000000
--- a/testing/cinepaint/cinepaint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/clamav/PKGBUILD b/testing/clamav/PKGBUILD
deleted file mode 100644
index 78b068e9f..000000000
--- a/testing/clamav/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 161925 2012-06-16 17:13:04Z dreisner $
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=clamav
-pkgver=0.97.5
-pkgrel=1
-pkgdesc='Anti-virus toolkit for Unix'
-url='http://www.clamav.net/'
-license=('GPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('bzip2' 'libltdl')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'conf.d'
-        'service'
-        'service.fresh'
-        'logrotate'
-        'tmpfiles.d'
-        'config.patch')
-sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9'
-          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
-          'cb116cdab49a810381a515cbcfb6a6c148547f07'
-          'df522b0488f3901e491f148c9300f6bae348c605'
-          'cda9a087e5593992150cb456e34c5f6f589aca82'
-          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
-          'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '1c8ef193919b041135115170acd6313f008de808')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../config.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/clamav \
-		--with-dbdir=/var/lib/clamav \
-		--disable-clamav \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# Make sure conf files get installed, because make install
-	# doesn't do that if clamav is already installed upon building.
-	install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
-	install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
-
-	install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
-	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
-	install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav
-}
diff --git a/testing/clamav/conf.d b/testing/clamav/conf.d
deleted file mode 100644
index 9cd44d9f8..000000000
--- a/testing/clamav/conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# clamav startup script config options
-
-# change these to "yes" to start 
-START_FRESHCLAM="no"
-START_CLAMD="no"
-
-# Options to pass to freshclam (man freshclam for more info).
-FRESHCLAM_OPTS="-c 12"
diff --git a/testing/clamav/config.patch b/testing/clamav/config.patch
deleted file mode 100644
index 0640df2c3..000000000
--- a/testing/clamav/config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf
---- old/etc/clamd.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/clamd.conf	2010-12-02 19:31:45.873357389 +0100
-@@ -14 +14 @@
--#LogFile /tmp/clamd.log
-+LogFile /var/log/clamav/clamd.log
-@@ -34 +34 @@
--#LogTime yes
-+LogTime yes
-@@ -61 +61 @@
--#PidFile /var/run/clamd.pid
-+PidFile /run/clamav/clamd.pid
-@@ -65 +65 @@
--#TemporaryDirectory /var/tmp
-+TemporaryDirectory /tmp
-@@ -80 +80 @@
--#LocalSocket /tmp/clamd.socket
-+LocalSocket /var/lib/clamav/clamd.sock
-@@ -190 +190 @@
--#User clamav
-+User clamav
-diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf
---- old/etc/freshclam.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/freshclam.conf	2010-12-02 19:31:51.190024057 +0100
-@@ -17 +17 @@
--#UpdateLogFile /var/log/freshclam.log
-+UpdateLogFile /var/log/clamav/freshclam.log
-@@ -121 +121 @@
--#NotifyClamd /path/to/clamd.conf
-+NotifyClamd /etc/clamav/clamd.conf
diff --git a/testing/clamav/install b/testing/clamav/install
deleted file mode 100644
index a2092e815..000000000
--- a/testing/clamav/install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-	getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
-	getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
-
-	chown -R clamav:clamav /var/lib/clamav
-	install -o clamav -g clamav -d /run/clamav
-	install -o clamav -g clamav -d /var/log/clamav
-}
-
-post_remove() {
-	getent passwd clamav &>/dev/null && userdel clamav >/dev/null
-	getent group clamav &>/dev/null && groupdel clamav >/dev/null
-	return 0
-}
diff --git a/testing/clamav/logrotate b/testing/clamav/logrotate
deleted file mode 100644
index 6a9051bed..000000000
--- a/testing/clamav/logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
-    create 644 clamav clamav
-    sharedscripts
-    postrotate
-            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
-            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
-    endscript
-}
diff --git a/testing/clamav/rc.d b/testing/clamav/rc.d
deleted file mode 100644
index 127c86c0f..000000000
--- a/testing/clamav/rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
-
-PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
-PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
-
-case "$1" in
-	start)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Starting ClamD"
-			[[ -z $PID_CD ]] && /usr/sbin/clamd
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-		sleep 1
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Starting FreshClam"
-			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	stop)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Stopping ClamD"
-			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
-				if [[ $? -gt 0 ]]; then
-					stat_fail
-				else
-					rm_daemon clamav
-					stat_done
-				fi
-		fi
-
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Stopping FreshClam"
-			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					rm_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"	
-esac
-exit 0
diff --git a/testing/clamav/service b/testing/clamav/service
deleted file mode 100644
index 5bf9eb14e..000000000
--- a/testing/clamav/service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav daemon
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/clamd.pid
-ExecStart=/usr/sbin/clamd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/clamav/service.fresh b/testing/clamav/service.fresh
deleted file mode 100644
index a0a72c2e6..000000000
--- a/testing/clamav/service.fresh
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav updater
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/freshclam.pid
-ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/clamav/tmpfiles.d b/testing/clamav/tmpfiles.d
deleted file mode 100644
index 22d29941e..000000000
--- a/testing/clamav/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/clamav 0755 clamav clamav
diff --git a/testing/cloog/PKGBUILD b/testing/cloog/PKGBUILD
deleted file mode 100644
index 45b3180a6..000000000
--- a/testing/cloog/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161918 2012-06-16 14:55:34Z heftig $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=cloog
-pkgver=0.17.0
-pkgrel=2
-pkgdesc="Library that generates loops for scanning polyhedra"
-arch=('i686' 'x86_64')
-url="http://www.bastoul.net/cloog/"
-license=('GPL')
-depends=('isl' 'gmp')
-conflicts=('cloog-ppl<0.15.10-2')
-options=('!libtool')
-source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
-md5sums=('0aa3302c81f65ca62c114e5264f8a802')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-isl=system --with-gmp=system
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/testing/clutter-gst/PKGBUILD b/testing/clutter-gst/PKGBUILD
deleted file mode 100644
index 3fe2197ba..000000000
--- a/testing/clutter-gst/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169268 2012-10-18 19:29:21Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=clutter-gst
-pkgver=1.9.92
-pkgrel=1
-pkgdesc="GStreamer bindings for clutter"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org/"
-license=('LGPL')
-depends=('clutter' 'gst-plugins-base-libs' 'libxdamage')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5c09dce218f711a44bd4d741e2dd10ffc47e7fcd7b0cf514ca0e92b825c76c45')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $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 d0d1059da..000000000
--- a/testing/clutter-gtk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169267 2012-10-18 19:29:18Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=clutter-gtk
-pkgver=1.4.0
-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')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d51c4bb6a6ad0a337976766383f97a1c905a37bd77b3dbf484a7314130d97b6e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD
deleted file mode 100644
index 8aa993d60..000000000
--- a/testing/clutter/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169269 2012-10-18 19:29:24Z jgc $
-# 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.12.2
-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' 'mesa' 'json-glib' 'atk' 'libxi')
-makedepends=('gobject-introspection' 'mesa')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-introspection
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/colord-gtk/PKGBUILD b/testing/colord-gtk/PKGBUILD
deleted file mode 100644
index b7d6d028c..000000000
--- a/testing/colord-gtk/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169266 2012-10-18 19:29:14Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=colord-gtk
-pkgver=0.1.23
-pkgrel=1
-pkgdesc="GTK integration for libcolord"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'gtk3' 'colord')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha1sums=('71fd56b34ba91ddf76c1ac394c2a31fa5e24770c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$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 b92249dca..000000000
--- a/testing/colord/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169265 2012-10-18 19:29:11Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=colord
-pkgver=0.1.23
-pkgrel=1
-pkgdesc="Color daemon"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha1sums=('08019c86f89b1675e4e155772cc555ed748f319e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  
-  # put udev files in /usr/lib
-  sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-  
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install \
-    bashcompletiondir=/usr/share/bash-completion/completions
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch b/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch
deleted file mode 100644
index 087b87cdb..000000000
--- a/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 6124a3842dfa8484b52e067a8ab8105c3875a4f7 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Thu, 10 May 2012 19:43:00 +0200
-Subject: [PATCH] ls: color each symlink-to-relative-name in / properly
-
-In order for ls --color to color each symlink, it must form the name
-of each referent and then stat it to see if the link is dangling, to
-a directory, to a file, etc.  When the symlink is to a relative name,
-ls must concatenate the starting directory name and that relative name.
-When, in addition, the starting directory was "/" or "/some-name",
-the result was ill-formed, and the subsequent stat would usually fail,
-making the caller color it as a dangling symlink.
-* src/ls.c (make_link_name): Don't botch the case in which
-dir_name(NAME) == "/" and LINKNAME is relative.
-* tests/ls/root-rel-symlink-color: New file.  Test for the above.
-* tests/Makefile.am (TESTS): Add it.
-* NEWS (Bug fixes): Mention it.
-Reported by Mike Frysinger in http://bugs.gnu.org/11453
-Bug introduced by commit v8.16-23-gbcb9078.
----
- NEWS                            |  5 ++++
- src/ls.c                        |  9 +++++++-
- tests/Makefile.am               |  1 +
- tests/ls/root-rel-symlink-color | 51 +++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 65 insertions(+), 1 deletion(-)
- create mode 100755 tests/ls/root-rel-symlink-color
-
-diff --git a/NEWS b/NEWS
-index 6c620b3..f9e9c70 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,11 @@ GNU coreutils NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Bug fixes
-+
-+  ls --color would mis-color relative-named symlinks in /
-+  [bug introduced in coreutils-8.17]
-+
- 
- * Noteworthy changes in release 8.17 (2012-05-10) [stable]
- 
-diff --git a/src/ls.c b/src/ls.c
-index 397e4ea..9494ae9 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -3213,7 +3213,14 @@ make_link_name (char const *name, char const *linkname)
-     return xstrdup (linkname);
- 
-   char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1);
--  stpcpy (stpncpy (p, name, prefix_len + 1), linkname);
-+
-+  /* PREFIX_LEN usually specifies a string not ending in slash.
-+     In that case, extend it by one, since the next byte *is* a slash.
-+     Otherwise, the prefix is "/", so leave the length unchanged.  */
-+  if ( ! ISSLASH (name[prefix_len - 1]))
-+    ++prefix_len;
-+
-+  stpcpy (stpncpy (p, name, prefix_len), linkname);
-   return p;
- }
- 
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a4370a6..0bafc5f 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -449,6 +449,7 @@ TESTS =						\
-   ls/proc-selinux-segfault			\
-   ls/readdir-mountpoint-inode			\
-   ls/recursive					\
-+  ls/root-rel-symlink-color			\
-   ls/rt-1					\
-   ls/slink-acl					\
-   ls/stat-dtype					\
-diff --git a/tests/ls/root-rel-symlink-color b/tests/ls/root-rel-symlink-color
-new file mode 100755
-index 0000000..d795432
---- /dev/null
-+++ b/tests/ls/root-rel-symlink-color
-@@ -0,0 +1,51 @@
-+#!/bin/sh
-+# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/".
-+
-+# Copyright (C) 2012 Free Software Foundation, Inc.
-+
-+# 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 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/init.sh"; path_prepend_ ../src
-+print_ver_ ls
-+
-+symlink_to_rel=
-+for i in /*; do
-+  # Skip non-symlinks:
-+  env test -h "$i" || continue
-+
-+  # Skip dangling symlinks:
-+  env test -e "$i" || continue
-+
-+  # Skip any symlink-to-absolute-name:
-+  case $(readlink "$i") in /*) continue ;; esac
-+
-+  symlink_to_rel=$i
-+  break
-+done
-+
-+test -z "$symlink_to_rel" \
-+  && skip_ no relative symlink in /
-+
-+e='\33'
-+color_code='01;36'
-+c_pre="$e[0m$e[${color_code}m"
-+c_post="$e[0m"
-+printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_
-+
-+env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \
-+  ls -d --color=always "$symlink_to_rel" > out || fail=1
-+
-+compare exp out || fail=1
-+
-+Exit $fail
--- 
-1.7.11.2
-
diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD
deleted file mode 100644
index b8cd14275..000000000
--- a/testing/coreutils/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 169602 2012-10-24 07:58:11Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=coreutils
-pkgver=8.20
-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' 'pam' 'acl' 'gmp' 'libcap')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('3d69af8f561fce512538a9fe85f147ff'
-         '7e6076e4e0961d24c38cf8685efca35b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib \
-              --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
-
-  # binaries required by FHS
-  _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false'
-        'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync'
-        'true' 'uname')
-  for i in ${_fhs[@]}; do
-    ln -s ../usr/bin/$i ${pkgdir}/bin/$i
-  done
-}
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.install b/testing/coreutils/coreutils.install
deleted file mode 100644
index 22cfcb2a1..000000000
--- a/testing/coreutils/coreutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-file=coreutils.info
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
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/cracklib/PKGBUILD b/testing/cracklib/PKGBUILD
deleted file mode 100644
index 101d7314f..000000000
--- a/testing/cracklib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165548 2012-08-23 12:34:30Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-
-pkgname=cracklib
-pkgver=2.8.19
-pkgrel=1
-pkgdesc="Password Checking Library"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://sourceforge.net/projects/cracklib"
-depends=('glibc' 'zlib')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('ca0ec168d9c6466612204e8dfb2df8a9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --without-python
-  make 
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  install -Dm644 dicts/cracklib-small $pkgdir/usr/share/dict/cracklib-small
-  sh ./util/cracklib-format dicts/cracklib-small \
-    | sh ./util/cracklib-packer $pkgdir/usr/share/cracklib/pw_dict
-}
diff --git a/testing/crda/PKGBUILD b/testing/crda/PKGBUILD
deleted file mode 100644
index 5969eefa4..000000000
--- a/testing/crda/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 165554 2012-08-23 18:09:19Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=crda
-pkgver=1.1.2
-pkgrel=4
-pkgdesc="Central Regulatory Domain Agent for wireless networks"
-arch=(i686 x86_64)
-url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
-license=('custom')
-depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw')
-makedepends=('python-m2crypto')
-install=crda.install
-source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
-        set-wireless-regdom
-        libnl32.patch)
-md5sums=('5226f65aebacf94baaf820f8b4e06df4'
-         '65c93f2ff2eb1b29d9e9fa102ae2dd45'
-         'c1f7aff29f15a0364ae6f7905a1d4ae6')
-                  
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -Np1 -i "$srcdir/libnl32.patch"
-  sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
-  make crda regdbdump
-}
-
-package() {
-  # Install crda, regdbdump and udev rules
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ SBINDIR=/usr/bin/ install
-  # Adjust paths in udev rule file
-  sed 's|/sbin/crda|/usr/bin/crda|' -i "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
-  # This rule automatically sets the regulatory domain when cfg80211 is loaded
-  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
-
-  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
-  
-  install -D -m755 "${srcdir}"/set-wireless-regdom "${pkgdir}"/usr/bin/set-wireless-regdom
-}
diff --git a/testing/crda/crda.install b/testing/crda/crda.install
deleted file mode 100644
index 9618a74ca..000000000
--- a/testing/crda/crda.install
+++ /dev/null
@@ -1,5 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom."
-  echo "It will automatically be set on boot."
-}
diff --git a/testing/crda/libnl32.patch b/testing/crda/libnl32.patch
deleted file mode 100644
index 682b6c5de..000000000
--- a/testing/crda/libnl32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile
---- crda-1.1.2/Makefile	2011-08-10 01:36:19.000000000 +0200
-+++ crda-1.1.2-libnl32/Makefile	2012-02-09 18:53:33.376430180 +0100
-@@ -51,7 +51,7 @@
- 
- ifeq ($(NL3FOUND),Y)
- CFLAGS += -DCONFIG_LIBNL30
--NLLIBS += -lnl-genl
-+NLLIBS += $(shell pkg-config --libs libnl-genl-3.0)
- NLLIBNAME = libnl-3.0
- else
- 	ifeq ($(NL2FOUND),Y)
diff --git a/testing/crda/set-wireless-regdom b/testing/crda/set-wireless-regdom
deleted file mode 100755
index 3905ae98a..000000000
--- a/testing/crda/set-wireless-regdom
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-unset WIRELESS_REGDOM
-. /etc/conf.d/wireless-regdom
-[ -n "${WIRELESS_REGDOM}" ] && iw reg set ${WIRELESS_REGDOM}
diff --git a/testing/cronie/PKGBUILD b/testing/cronie/PKGBUILD
deleted file mode 100644
index 2dd18b16f..000000000
--- a/testing/cronie/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname='cronie'
-pkgver=1.4.8
-pkgrel=3
-pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
-url='https://fedorahosted.org/cronie/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-depends=('pam' 'bash' 'run-parts')
-optdepends=('pm-utils: defer anacron when on battery power'
-            'smtp-server: sending cron job output via email')
-
-source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'cron.deny'
-	'service'
-        'pam.d'
-        'rc.d')
-sha1sums=('1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3'
-          '0f279b8fb820340267d578dc85511c980715f91e'
-          '3038a05476829f72fc4918bee9176b273ce10340'
-          '5eff7fb31f6bc0a924243ff046704726cf20c221'
-          'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
-
-backup=('etc/anacrontab'
-        'etc/conf.d/crond'
-        'etc/pam.d/crond'
-        'etc/cron.deny')
-
-conflicts=('cron')
-provides=('cron')
-groups=('base')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-anacron \
-		--with-inotify \
-		--with-pam \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	chmod u+s "${pkgdir}"/usr/bin/crontab
-	install -d "${pkgdir}"/var/spool/{ana,}cron
-	install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
-	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
-	install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service
-
-	install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond
-	install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab
-	install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly
-	install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
-
-	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING
-
-	# Provide native service for arch-daemons generator
-	ln -s cronie.service "$pkgdir/usr/lib/systemd/system/crond.service"
-}
diff --git a/testing/cronie/cron.deny b/testing/cronie/cron.deny
deleted file mode 100644
index 06e685cc8..000000000
--- a/testing/cronie/cron.deny
+++ /dev/null
@@ -1 +0,0 @@
-# without this file, only users listed in /etc/cron.allow can use crontab
diff --git a/testing/cronie/pam.d b/testing/cronie/pam.d
deleted file mode 100644
index 9a254ebc0..000000000
--- a/testing/cronie/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-auth      required    pam_unix.so
-auth      required    pam_env.so
-
-account   required    pam_access.so
-account   required    pam_unix.so
-account   required    pam_time.so
-
-session    required   pam_loginuid.so
-session   required    pam_limits.so
-session   required    pam_unix.so
diff --git a/testing/cronie/rc.d b/testing/cronie/rc.d
deleted file mode 100755
index d0659685c..000000000
--- a/testing/cronie/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=crond
-. /etc/conf.d/crond
-PID=$(pidof -o %PPID /usr/sbin/crond)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/testing/cronie/service b/testing/cronie/service
deleted file mode 100644
index 5ae193bfc..000000000
--- a/testing/cronie/service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Periodic Command Scheduler
-
-[Service]
-ExecStart=/usr/sbin/crond -n
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD
deleted file mode 100644
index b0e2a3f87..000000000
--- a/testing/cryptsetup/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169408 2012-10-20 16:46:59Z dreisner $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=cryptsetup
-pkgver=1.5.1
-pkgrel=1
-pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://code.google.com/p/cryptsetup/"
-groups=('base')
-depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
-options=('!libtool' '!emptydirs')
-source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
-        http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
-        encrypt_hook
-        encrypt_install)
-md5sums=('87cc018c0c65f36043f38ceb8ffd4d81'
-         '5f711687f453f4d5a38596f60df5247a'
-         'c970831d733ca42e20415005967e7843'
-         '21c45f9cab3e0b5165f68358884fbd0f')
-
-build() {
-  cd "${srcdir}"/$pkgname-${pkgver}
-  ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # install hook
-  install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
-  install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
-}
diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook
deleted file mode 100644
index 11db3443a..000000000
--- a/testing/cryptsetup/encrypt_hook
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    modprobe -a -q dm-crypt >/dev/null 2>&1
-    [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
-
-    # Get keyfile if specified
-    ckeyfile="/crypto_keyfile.bin"
-    if [ -n "$cryptkey" ]; then
-        IFS=: read ckdev ckarg1 ckarg2 <<EOF
-$cryptkey
-EOF
-
-        if [ "$ckdev" = "rootfs" ]; then
-            ckeyfile=$ckarg1
-        elif resolved=$(resolve_device "${ckdev}" ${rootdelay}); then
-            case ${ckarg1} in
-                *[!0-9]*)
-                    # Use a file on the device
-                    # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
-                    mkdir /ckey
-                    mount -r -t "$ckarg1" "$resolved" /ckey
-                    dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1
-                    umount /ckey
-                    ;;
-                *)
-                    # Read raw data from the block device
-                    # ckarg1 is numeric: ckarg1=offset, ckarg2=length
-                    dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1
-                    ;;
-            esac
-        fi
-        [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase."
-    fi
-
-    if [ -n "${cryptdevice}" ]; then
-        DEPRECATED_CRYPT=0
-        IFS=: read cryptdev cryptname cryptoptions <<EOF
-$cryptdevice
-EOF
-    else
-        DEPRECATED_CRYPT=1
-        cryptdev="${root}"
-        cryptname="root"
-    fi
-
-    warn_deprecated() {
-        echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated"
-        echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead."
-    }
-
-    for cryptopt in ${cryptoptions//,/ }; do
-        case ${cryptopt} in
-            allow-discards)
-                cryptargs="${cryptargs} --allow-discards"
-                ;;
-            *)
-                echo "Encryption option '${cryptopt}' not known, ignoring." >&2
-                ;;
-        esac
-    done
-
-    if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
-        if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
-            [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
-            dopassphrase=1
-            # If keyfile exists, try to use that
-            if [ -f ${ckeyfile} ]; then
-                if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then
-                    dopassphrase=0
-                else
-                    echo "Invalid keyfile. Reverting to passphrase."
-                fi
-            fi
-            # Ask for a passphrase
-            if [ ${dopassphrase} -gt 0 ]; then
-                echo ""
-                echo "A password is required to access the ${cryptname} volume:"
-
-                #loop until we get a real password
-                while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do
-                    sleep 2;
-                done
-            fi
-            if [ -e "/dev/mapper/${cryptname}" ]; then
-                if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
-                    export root="/dev/mapper/root"
-                fi
-            else
-                err "Password succeeded, but ${cryptname} creation failed, aborting..."
-                exit 1
-            fi
-        elif [ -n "${crypto}" ]; then
-            [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
-            msg "Non-LUKS encrypted device found..."
-            if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then
-                err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip"
-                err "Non-LUKS decryption not attempted..."
-                return 1
-            fi
-            exe="cryptsetup create $cryptname $resolved $cryptargs"
-            IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF
-$crypto
-EOF
-            [ -n "$c_hash" ]    && exe="$exe --hash '$c_hash'"
-            [ -n "$c_cipher" ]  && exe="$exe --cipher '$c_cipher'"
-            [ -n "$c_keysize" ] && exe="$exe --key-size '$c_keysize'"
-            [ -n "$c_offset" ]  && exe="$exe --offset '$c_offset'"
-            [ -n "$c_skip" ]    && exe="$exe --skip '$c_skip'"
-            if [ -f "$ckeyfile" ]; then
-                exe="$exe --key-file $ckeyfile"
-            else
-                exe="$exe --verify-passphrase"
-                echo ""
-                echo "A password is required to access the ${cryptname} volume:"
-            fi
-            eval "$exe $CSQUIET"
-
-            if [ $? -ne 0 ]; then
-                err "Non-LUKS device decryption failed. verify format: "
-                err "      crypto=hash:cipher:keysize:offset:skip"
-                exit 1
-            fi
-            if [ -e "/dev/mapper/${cryptname}" ]; then
-                if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
-                    export root="/dev/mapper/root"
-                fi
-            else
-                err "Password succeeded, but ${cryptname} creation failed, aborting..."
-                exit 1
-            fi
-        else
-            err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified."
-        fi
-    fi
-    rm -f ${ckeyfile}
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install
deleted file mode 100644
index 38e5ddc57..000000000
--- a/testing/cryptsetup/encrypt_install
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-build() {
-    local mod
-
-    add_module dm-crypt
-    if [[ $CRYPTO_MODULES ]]; then
-        for mod in $CRYPTO_MODULES; do
-            add_module "$mod"
-        done
-    else
-        add_all_modules '/crypto/'
-    fi
-
-    add_binary "cryptsetup"
-    add_binary "dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook allows for an encrypted root device. Users should specify the device
-to be unlocked using 'cryptdevice=device:dmname' on the kernel command line,
-where 'device' is the path to the raw device, and 'dmname' is the name given to
-the device after unlocking, and will be available as /dev/mapper/dmname.
-
-For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on
-the kernel cmdline, where 'device' represents the raw block device where the key
-exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is
-the absolute path of the keyfile within the device.
-
-Without specifying a keyfile, you will be prompted for the password at runtime.
-This means you must have a keyboard available to input it, and you may need
-the keymap hook as well to ensure that the keyboard is using the layout you
-expect.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/cups/PKGBUILD b/testing/cups/PKGBUILD
deleted file mode 100644
index 12273883e..000000000
--- a/testing/cups/PKGBUILD
+++ /dev/null
@@ -1,174 +0,0 @@
-# $Id: PKGBUILD 165915 2012-09-03 20:05:26Z heftig $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.6.1
-pkgrel=6
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
-             'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme' 'systemd')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-        cups-no-export-ssllibs.patch
-        cups-no-gcrypt.patch
-        cups-no-gzip-man.patch
-        cups-systemd-socket.patch
-        cups cups.logrotate cups.pam
-        cupsd-conf-remove-obsolete-browse-directives.patch
-        avahi-missing-in-conditionals.patch
-        recognize-remote-cups-queue-via-dnssd-uri.patch
-        usb-backend-reset-after-job-only-for-specific-devices.patch)
-#options=('!emptydirs')
-md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
-         '9b8467a1e51d360096b70e2c3c081e6c'
-         '3733c23e77eb503bd94cc368e02830dc'
-         '90c30380d4c8cd48a908cfdadae1ea24'
-         'b4868b83f7f2d6ec24a1be76509379f0'
-         '9657daa21760bb0b5fa3d8b51d5e01a1'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17'
-         '6bef262b5081051e88cd2ae94fed1867'
-         '9c91b1319f4b20dc323986cb4abbe806'
-         'dcef8dd5614461166cada8a706eebb49'
-         '0779ef8ba1d724ebb3b9bf360deba52b')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  # add systemd socket support - Fedora patch, also used in Gentoo
-  # modified now to the changes done by Gentoo in their svn ebuild
-  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
-  patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
-  
-  # Do not export SSL libs in cups-config
-  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
-  patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
-  # don't zip man pages in make install, let makepkg do that / Fedora
-  patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
-
-  # upstream bugtracker patches
-  # http://www.cups.org/str.php?L4157 - fix broken default server config
-  patch -Np1 -i ${srcdir}/cupsd-conf-remove-obsolete-browse-directives.patch
-  # http://www.cups.org/str.php?L4156 - In many DNS-SD/Bonjour conditionals Avahi is not considered
-  patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
-  # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to CUPS server are not considered remote printers with driver on server
-  patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
-  # http://cups.org/str.php?L4155 / https://bugs.archlinux.org/task/30965
-  patch -Np0 -i ${srcdir}/usb-backend-reset-after-job-only-for-specific-devices.patch
-  
-  # Rebuild configure script for not zipping man-pages.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --libdir=/usr/lib \
-     --with-systemdsystemunitdir=/usr/lib/systemd/system \
-     --with-logdir=/var/log/cups \
-     --with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon \
-     --with-cups-group=lp \
-     --enable-pam=yes \
-     --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-gnutls \
-     --enable-threads \
-     --enable-avahi\
-     --with-php=/usr/bin/php-cgi \
-     --with-optim="$CFLAGS"
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  #httpAddrGetList(workstation64): FAIL
-  #1 TESTS FAILED!
-  #make[1]: *** [testhttp] Error 1
-  make -k check || /bin/true
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
-backup=(etc/cups/client.conf)
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin 
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-  
-  # install client.conf man page and config file
-  install -dm755 ${pkgdir}/usr/share/man/man5
-  #install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
-  install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
-  install -dm755 ${pkgdir}/etc/cups
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
-  chgrp lp ${pkgdir}/etc/cups/client.conf
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - daemon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
-        etc/cups/snmp.conf
-        etc/cups/printers.conf
-        etc/cups/classes.conf
-        etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
-        etc/logrotate.d/cups
-        etc/pam.d/cups
-        etc/xinetd.d/cups-lpd)
-depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
-optdepends=('xdg-utils: xdg .desktop file support')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec
-
-  # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
-
-  # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
-  # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
-
-  # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  # remove directory from package, we create it in cups rc.d file
-  rm -rf ${pkgdir}/var/run
-
-  # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf}
-  
-  # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-  
-  # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-  
-  # remove client.conf man page
-  rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
-  
-  # remove files now part of cups-filters
-  rm -v ${pkgdir}/usr/share/cups/banners/*
-  rm -v ${pkgdir}/usr/share/cups/data/testprint
-  # comment out all conversion rules which use any of the removed filters
-  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
-
-  # Provide native service for arch-daemons generator
-  ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service"
-}
diff --git a/testing/cups/PKGBUILD.16 b/testing/cups/PKGBUILD.16
deleted file mode 100644
index 01faba047..000000000
--- a/testing/cups/PKGBUILD.16
+++ /dev/null
@@ -1,146 +0,0 @@
-# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.6b1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord'
-             'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-        cups-no-export-ssllibs.patch
-        cups-no-gcrypt.patch
-        cups-no-gzip-man.patch
-        cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('468a40755a872d84be89111ce97a69d1'
-         '9b8467a1e51d360096b70e2c3c081e6c'
-         '3733c23e77eb503bd94cc368e02830dc'
-         '90c30380d4c8cd48a908cfdadae1ea24'
-         '9657daa21760bb0b5fa3d8b51d5e01a1'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  # Do not export SSL libs in cups-config
-  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
-  patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
-  # don't zip man pages in make install, let makepkg do that / Fedora
-  patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
-  
-  # Rebuild configure script for not zipping man-pages.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --libdir=/usr/lib \
-     --with-logdir=/var/log/cups \
-     --with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon \
-     --with-cups-group=lp \
-     --enable-pam=yes \
-     --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-gnutls \
-     --enable-threads \
-     --enable-avahi\
-     --with-php=/usr/bin/php-cgi \
-     --with-optim="$CFLAGS"
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  #httpAddrGetList(workstation64): FAIL
-  #1 TESTS FAILED!
-  #make[1]: *** [testhttp] Error 1
-  make -k check || /bin/true
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
-backup=(etc/cups/client.conf)
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin 
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-  
-  # install client.conf man page and config file
-  install -dm755 ${pkgdir}/usr/share/man/man5
-  #install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
-  install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
-  install -dm755 ${pkgdir}/etc/cups
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
-  chgrp lp ${pkgdir}/etc/cups/client.conf
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - daemon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
-        etc/cups/snmp.conf
-        etc/cups/printers.conf
-        etc/cups/classes.conf
-        etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
-        etc/logrotate.d/cups
-        etc/pam.d/cups
-        etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('xdg-utils: xdg .desktop file support')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec
-
-  # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
-
-  # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
-  # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
-
-  # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  # remove directory from package, we create it in cups rc.d file
-  rm -rf ${pkgdir}/var/run
-
-  # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf}
-  
-  # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-  
-  # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-  
-  # remove client.conf man page
-  rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
-  
-  # remove files now part of cups-filters
-  rm -v ${pkgdir}/usr/lib/cups/filter/bannertops
-  rm -v ${pkgdir}/usr/share/cups/banners/*
-  rm -v ${pkgdir}/usr/share/cups/data/testprint
-  # comment out all conversion rules which use any of the removed filters
-  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
-}
diff --git a/testing/cups/avahi-missing-in-conditionals.patch b/testing/cups/avahi-missing-in-conditionals.patch
deleted file mode 100644
index b261f58ae..000000000
--- a/testing/cups/avahi-missing-in-conditionals.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -uraN cups/scheduler/client.c cups-new/scheduler/client.c
---- cups/scheduler/client.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/client.c	2012-08-04 20:13:17.082220961 +0200
-@@ -4021,7 +4021,7 @@
- 	    !strncmp(host, "[::1]:", 6));
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4040,7 +4040,7 @@
- 	      !_cups_strcasecmp(end, ".local.") ||
- 	      !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-  /*
-   * Check if the hostname is an IP address...
-@@ -4101,7 +4101,7 @@
-     }
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
-        a;
-        a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
-@@ -4126,7 +4126,7 @@
-         return (1);
-     }
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-  /*
-   * Check for interface hostname matches...
-diff -uraN cups/scheduler/conf.c cups-new/scheduler/conf.c
---- cups/scheduler/conf.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/conf.c	2012-08-04 20:15:49.830978405 +0200
-@@ -89,9 +89,9 @@
- {
-   { "AccessLog",		&AccessLog,		CUPSD_VARTYPE_STRING },
-   { "AutoPurgeJobs", 		&JobAutoPurge,		CUPSD_VARTYPE_BOOLEAN },
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   { "BrowseDNSSDSubTypes",	&DNSSDSubTypes,		CUPSD_VARTYPE_STRING },
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-   { "BrowseWebIF",		&BrowseWebIF,		CUPSD_VARTYPE_BOOLEAN },
-   { "Browsing",			&Browsing,		CUPSD_VARTYPE_BOOLEAN },
-   { "CacheDir",			&CacheDir,		CUPSD_VARTYPE_STRING },
-@@ -735,9 +735,9 @@
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDSubTypes, "_cups,_print");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
-   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
-diff -uraN cups/scheduler/ipp.c cups-new/scheduler/ipp.c
---- cups/scheduler/ipp.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/ipp.c	2012-08-04 20:13:17.086220978 +0200
-@@ -4813,7 +4813,7 @@
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -4823,7 +4823,7 @@
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -uraN cups/scheduler/main.c cups-new/scheduler/main.c
---- cups/scheduler/main.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/main.c	2012-08-04 20:13:17.090221001 +0200
-@@ -781,9 +781,9 @@
-       * Got an error from select!
-       */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       cupsd_printer_t	*p;		/* Current printer */
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
- 
-       if (errno == EINTR)		/* Just interrupted by a signal */
-@@ -824,13 +824,13 @@
- 			job->print_pipes[0], job->print_pipes[1],
- 			job->back_pipes[0], job->back_pipes[1]);
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
- 	   p;
- 	   p = (cupsd_printer_t *)cupsArrayNext(Printers))
-         cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
- 	                p->reg_name ? p->reg_name : "(null)");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-       break;
-     }
diff --git a/testing/cups/cups b/testing/cups/cups
deleted file mode 100755
index 744c8e663..000000000
--- a/testing/cups/cups
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=cupsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-        pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/cups/cups-avahi-1-config.patch b/testing/cups/cups-avahi-1-config.patch
deleted file mode 100644
index 304cd2607..000000000
--- a/testing/cups/cups-avahi-1-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in
---- cups-1.5.2/config.h.in.avahi-1-config	2011-06-16 21:12:16.000000000 +0100
-+++ cups-1.5.2/config.h.in	2012-03-14 15:04:51.365347165 +0000
-@@ -390,6 +390,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
-diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4
---- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config	2011-05-12 06:21:56.000000000 +0100
-+++ cups-1.5.2/config-scripts/cups-dnssd.m4	2012-03-14 15:04:51.365347165 +0000
-@@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
- DNSSDLIBS=""
- DNSSD_BACKEND=""
- 
-+AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
-+	      [if test x$enable_avahi = xyes; then
-+		       AC_MSG_CHECKING(for Avahi)
-+		       if $PKGCONFIG --exists avahi-client; then
-+			       AC_MSG_RESULT(yes)
-+			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+			       DNSSD_BACKEND="dnssd"
-+			       AC_DEFINE(HAVE_AVAHI)
-+			       enable_dnssd=no
-+		       else
-+			       AC_MSG_RESULT(no)
-+		       fi
-+	       fi])
-+
- if test x$enable_dnssd != xno; then
- 	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
\ No newline at end of file
diff --git a/testing/cups/cups-avahi-2-backend.patch b/testing/cups/cups-avahi-2-backend.patch
deleted file mode 100644
index 00e12a0a3..000000000
--- a/testing/cups/cups-avahi-2-backend.patch
+++ /dev/null
@@ -1,1118 +0,0 @@
-diff -up cups-1.5.3/backend/dnssd.c.avahi-2-backend cups-1.5.3/backend/dnssd.c
---- cups-1.5.3/backend/dnssd.c.avahi-2-backend	2012-05-15 16:53:18.164774446 +0200
-+++ cups-1.5.3/backend/dnssd.c	2012-05-15 17:09:07.684155704 +0200
-@@ -15,14 +15,21 @@
-  *
-  * Contents:
-  *
-+ *   next_txt_record()       - Get next TXT record from a cups_txt_records_t.
-+ *   parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
-  *   main()                  - Browse for printers.
-  *   browse_callback()       - Browse devices.
-  *   browse_local_callback() - Browse local devices.
-  *   compare_devices()       - Compare two devices.
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-+ *   device_type()           - Get DNS-SD type enumeration from string.
-  *   get_device()            - Create or update a device.
-  *   query_callback()        - Process query data.
-+ *   avahi_client_callback() - Avahi client callback function.
-+ *   avahi_query_callback()  - Avahi query callback function.
-+ *   avahi_browse_callback() - Avahi browse callback function.
-+ *   find_device()           - Find a device from its name and domain.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-  */
-@@ -33,7 +40,18 @@
- 
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+#  include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#  include <avahi-common/domain.h>
-+#  include <avahi-common/error.h>
-+#  include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -53,7 +71,12 @@ typedef enum
- 
- typedef struct
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceRef	ref;			/* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		resolved;		/* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
-   char		*name,			/* Service name */
- 		*domain,		/* Domain name */
- 		*fullName,		/* Full name */
-@@ -65,6 +88,20 @@ typedef struct
- 		sent;			/* Did we list the device? */
- } cups_device_t;
- 
-+typedef struct
-+{
-+  char key[256];
-+  char value[256];
-+
-+#ifdef HAVE_DNSSD
-+  const uint8_t *data;
-+  const uint8_t *datanext;
-+  const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+  AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
- 
- /*
-  * Local globals...
-@@ -78,6 +115,7 @@ static int		job_canceled = 0;
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -95,13 +133,6 @@ static void		browse_local_callback(DNSSe
- 					      const char *replyDomain,
- 					      void *context)
- 					      __attribute__((nonnull(1,5,6,7,8)));
--static int		compare_devices(cups_device_t *a, cups_device_t *b);
--static void		exec_backend(char **argv);
--static cups_device_t	*get_device(cups_array_t *devices,
--			            const char *serviceName,
--			            const char *regtype,
--				    const char *replyDomain)
--				    __attribute__((nonnull(1,2,3,4)));
- static void		query_callback(DNSServiceRef sdRef,
- 			               DNSServiceFlags flags,
- 				       uint32_t interfaceIndex,
-@@ -111,10 +142,119 @@ static void		query_callback(DNSServiceRe
- 				       const void *rdata, uint32_t ttl,
- 				       void *context)
- 				       __attribute__((nonnull(1,5,9,11)));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void		avahi_client_callback (AvahiClient *client,
-+					       AvahiClientState state,
-+					       void *context);
-+static void		avahi_browse_callback (AvahiServiceBrowser *browser,
-+					       AvahiIfIndex interface,
-+					       AvahiProtocol protocol,
-+					       AvahiBrowserEvent event,
-+					       const char *serviceName,
-+					       const char *regtype,
-+					       const char *replyDomain,
-+					       AvahiLookupResultFlags flags,
-+					       void *context);
-+#endif /* HAVE_AVAHI */
-+static cups_device_t *	find_device (cups_array_t *devices,
-+				     cups_txt_records_t *txt,
-+				     cups_device_t *dkey);
-+static int		compare_devices(cups_device_t *a, cups_device_t *b);
-+static void		exec_backend(char **argv);
-+static cups_device_t	*get_device(cups_array_t *devices,
-+			            const char *serviceName,
-+			            const char *regtype,
-+				    const char *replyDomain)
-+				    __attribute__((nonnull(1,2,3,4)));
- static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize)
- 			    __attribute__((nonnull(1,2)));
- 
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
-+ */
-+
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+  txt->txt = avahi_string_list_get_next (txt->txt);
-+  if (txt->txt == NULL)
-+    return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+  return txt;
-+}
-+
-+
-+/*
-+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
-+ */
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  uint8_t	datalen;
-+  uint8_t	*data = txt->data;
-+  char		*ptr;
-+
-+ /*
-+  * Read a key/value pair starting with an 8-bit length.  Since the
-+  * length is 8 bits and the size of the key/value buffers is 256, we
-+  * don't need to check for overflow...
-+  */
-+
-+  datalen = *data++;
-+  if (!datalen || (data + datalen) > txt->dataend)
-+    return NULL;
-+  txt->datanext = data + datalen;
-+
-+  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+    *ptr++ = *data;
-+  *ptr = '\0';
-+
-+  if (data < txt->datanext && *data == '=')
-+  {
-+    data++;
-+
-+    if (data < datanext)
-+      memcpy (txt->value, data, txt->datanext - data);
-+    value[txt->datanext - data] = '\0';
-+  }
-+  else
-+    return 1;
-+#else /* HAVE_AVAHI */
-+  char *key, *value;
-+  size_t len;
-+  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+  if (len > sizeof (txt->value) - 1)
-+    len = sizeof (txt->value) - 1;
-+
-+  memcpy (txt->value, value, len);
-+  txt->value[len] = '\0';
-+  len = strlen (key);
-+  if (len > sizeof (txt->key) - 1)
-+    len = sizeof (txt->key) - 1;
-+
-+  memcpy (txt->key, key, len);
-+  txt->key[len] = '\0';
-+  avahi_free (key);
-+  avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+  return 0;
-+}
-+
- 
- /*
-  * 'main()' - Browse for printers.
-@@ -125,6 +265,13 @@ main(int  argc,				/* I - Number of comm
-      char *argv[])			/* I - Command-line arguments */
- {
-   const char	*name;			/* Backend name */
-+  cups_array_t	*devices;		/* Device array */
-+  cups_device_t	*device;		/* Current device */
-+  char		uriName[1024];		/* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+  int		fd;			/* Main file descriptor */
-+  fd_set	input;			/* Input set for select() */
-+  struct timeval timeout;		/* Timeout for select() */
-   DNSServiceRef	main_ref,		/* Main service reference */
- 		fax_ipp_ref,		/* IPP fax service reference */
- 		ipp_ref,		/* IPP service reference */
-@@ -138,12 +285,11 @@ main(int  argc,				/* I - Number of comm
- 		pdl_datastream_ref,	/* AppSocket service reference */
- 		printer_ref,		/* LPD service reference */
- 		riousbprint_ref;	/* Remote IO service reference */
--  int		fd;			/* Main file descriptor */
--  fd_set	input;			/* Input set for select() */
--  struct timeval timeout;		/* Timeout for select() */
--  cups_array_t	*devices;		/* Device array */
--  cups_device_t	*device;		/* Current device */
--  char		uriName[1024];		/* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiClient	*client;
-+  int		error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -203,6 +349,49 @@ main(int  argc,				/* I - Number of comm
-   * Browse for different kinds of printers...
-   */
- 
-+#ifdef HAVE_AVAHI
-+  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+  {
-+    perror ("ERROR: Unable to create avahi simple poll object");
-+    return (1);
-+  }
-+
-+  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+			     0, avahi_client_callback, NULL, &error);
-+  if (!client)
-+  {
-+    perror ("DEBUG: Unable to create avahi client");
-+    return (0);
-+  }
-+
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_fax-ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp-tls._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_pdl-datastream._tcp",
-+			     NULL, 0,
-+			     avahi_browse_callback,
-+			     devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_printer._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_riousbprint._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-   {
-     perror("ERROR: Unable to create service connection");
-@@ -263,6 +452,7 @@ main(int  argc,				/* I - Number of comm
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -270,6 +460,9 @@ main(int  argc,				/* I - Number of comm
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -289,11 +482,35 @@ main(int  argc,				/* I - Number of comm
-     }
-     else
-     {
-+      announce = 1;
-+    }
-+#else /* HAVE_AVAHI */
-+    int r;
-+    avahi_got_callback = 0;
-+    r = avahi_simple_poll_iterate (simple_poll, 1);
-+    if (r != 0 && r != EINTR)
-+    {
-+     /*
-+      * We've been told to exit the loop.  Perhaps the connection to
-+      * avahi failed.
-+      */
-+
-+      break;
-+    }
-+
-+    if (avahi_got_callback)
-+      announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+    if (announce)
-+    {
-      /*
-       * Announce any devices we've found...
-       */
- 
-+#ifdef HAVE_DNSSD
-       DNSServiceErrorType status;	/* DNS query status */
-+#endif /* HAVE_DNSSD */
-       cups_device_t *best;		/* Best matching device */
-       char	device_uri[1024];	/* Device URI */
-       int	count;			/* Number of queries */
-@@ -307,6 +524,7 @@ main(int  argc,				/* I - Number of comm
-         if (device->sent)
- 	  sent ++;
- 
-+#ifdef HAVE_DNSSD
-         if (device->ref)
- 	  count ++;
- 
-@@ -338,14 +556,23 @@ main(int  argc,				/* I - Number of comm
- 	      count ++;
-           }
- 	}
--	else if (!device->sent)
-+	else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+	if (!device->resolved)
-+	  continue;
-+        else
-+#endif /* HAVE_AVAHI */
-+	if (!device->sent)
- 	{
-+#ifdef HAVE_DNSSD
- 	 /*
- 	  * Got the TXT records, now report the device...
- 	  */
- 
- 	  DNSServiceRefDeallocate(device->ref);
- 	  device->ref = 0;
-+#endif /* HAVE_DNSSD */
- 
-           if (!best)
- 	    best = device;
-@@ -406,6 +633,7 @@ main(int  argc,				/* I - Number of comm
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'browse_callback()' - Browse devices.
-  */
-@@ -494,6 +722,7 @@ browse_local_callback(
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -574,6 +803,41 @@ exec_backend(char **argv)		/* I - Comman
- 
- 
- /*
-+ * 'device_type()' - Get DNS-SD type enumeration from string.
-+ */
-+
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp"))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+  if (!strcmp(regtype, "_ipp._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp.") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp."))
-+    return (CUPS_DEVICE_PRINTER);
-+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+  return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
-+
-+/*
-  * 'get_device()' - Create or update a device.
-  */
- 
-@@ -594,20 +858,7 @@ get_device(cups_array_t *devices,	/* I -
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  else if (!strcmp(regtype, "_ipps._tcp.") ||
--	   !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPPS;
--  else if (!strcmp(regtype, "_fax-ipp._tcp."))
--    key.type = CUPS_DEVICE_FAX_IPP;
--  else if (!strcmp(regtype, "_printer._tcp."))
--    key.type = CUPS_DEVICE_PRINTER;
--  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
--    key.type = CUPS_DEVICE_PDL_DATASTREAM;
--  else
--    key.type = CUPS_DEVICE_RIOUSBPRINT;
-+  key.type = device_type (regtype);
- 
-   for (device = cupsArrayFind(devices, &key);
-        device;
-@@ -627,8 +878,14 @@ get_device(cups_array_t *devices,	/* I -
-         free(device->domain);
- 	device->domain = strdup(replyDomain);
- 
-+#ifdef HAVE_DNSSD
- 	DNSServiceConstructFullName(fullName, device->name, regtype,
- 	                            replyDomain);
-+#else /* HAVE_AVAHI */
-+	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+				 serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- 	free(device->fullName);
- 	device->fullName = strdup(fullName);
-       }
-@@ -648,6 +905,9 @@ get_device(cups_array_t *devices,	/* I -
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -655,13 +915,20 @@ get_device(cups_array_t *devices,	/* I -
-   * Set the "full name" of this service, which is used for queries...
-   */
- 
-+#ifdef HAVE_DNSSD
-   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+			   serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
-   device->fullName = strdup(fullName);
- 
-   return (device);
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'query_callback()' - Process query data.
-  */
-@@ -685,7 +952,7 @@ query_callback(
- 		*ptr;			/* Pointer into string */
-   cups_device_t	dkey,			/* Search key */
- 		*device;		/* Device */
--
-+  cups_txt_records_t txt;
- 
-   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -719,94 +986,233 @@ query_callback(
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  else if (strstr(fullName, "_ipps._tcp.") ||
--           strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPPS;
--  else if (strstr(fullName, "_fax-ipp._tcp."))
--    dkey.type = CUPS_DEVICE_FAX_IPP;
--  else if (strstr(fullName, "_printer._tcp."))
--    dkey.type = CUPS_DEVICE_PRINTER;
--  else if (strstr(fullName, "_pdl-datastream._tcp."))
--    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+  dkey.type = device_type (fullName);
-+
-+  txt.data = rdata;
-+  txt.dataend = rdata + rdlen;
-+  device = find_device ((cups_array_t *) context, &txt, &dkey);
-+  if (!device)
-+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_client_callback()' - Avahi client callback function.
-+ */
-+
-+static void
-+avahi_client_callback(AvahiClient *client,
-+		      AvahiClientState state,
-+		      void *context)
-+{
-+ /*
-+  * If the connection drops, quit.
-+  */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+  {
-+    fprintf (stderr, "ERROR: Avahi connection failed\n");
-+    avahi_simple_poll_quit (simple_poll);
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_query_callback()' - Avahi query callback function.
-+ */
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+		     AvahiIfIndex interface,
-+		     AvahiProtocol protocol,
-+		     AvahiResolverEvent event,
-+		     const char *name,
-+		     const char *type,
-+		     const char *domain,
-+		     const char *host_name,
-+		     const AvahiAddress *address,
-+		     uint16_t port,
-+		     AvahiStringList *txt,
-+		     AvahiLookupResultFlags flags,
-+		     void *context)
-+{
-+  AvahiClient		*client;
-+  cups_device_t		key,
-+			*device;
-+  char			uqname[1024],
-+			*ptr;
-+  cups_txt_records_t	txtr;
-+
-+  client = avahi_service_resolver_get_client (resolver);
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    if (event == AVAHI_RESOLVER_FAILURE)
-+    {
-+      fprintf (stderr, "ERROR: %s\n",
-+	       avahi_strerror (avahi_client_errno (client)));
-+    }
-+
-+    avahi_service_resolver_free (resolver);
-+    return;
-+  }
-+
-+ /*
-+  * Set search key for device.
-+  */
-+
-+  key.name = uqname;
-+  unquote (uqname, name, sizeof (uqname));
-+  if ((ptr = strstr(name, "._")) != NULL)
-+    *ptr = '\0';
-+
-+  key.domain = (char *) domain;
-+  key.type = device_type (type);
-+
-+ /*
-+  * Find the device and the the TXT information.
-+  */
-+
-+  txtr.txt = txt;
-+  device = find_device ((cups_array_t *) context, &txtr, &key);
-+  if (device)
-+  {
-+   /*
-+    * Let the main loop know to announce the device.
-+    */
-+
-+    device->resolved = 1;
-+    avahi_got_callback = 1;
-+  }
-   else
--    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+  avahi_service_resolver_free (resolver);
-+}
-+
-+
-+/*
-+ * 'avahi_browse_callback()' - Avahi browse callback function.
-+ */
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+		      AvahiIfIndex interface,
-+		      AvahiProtocol protocol,
-+		      AvahiBrowserEvent event,
-+		      const char *name,
-+		      const char *type,
-+		      const char *domain,
-+		      AvahiLookupResultFlags flags,
-+		      void *context)
-+{
-+  AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+  switch (event)
-+  {
-+  case AVAHI_BROWSER_FAILURE:
-+    fprintf (stderr, "ERROR: %s\n",
-+	     avahi_strerror (avahi_client_errno (client)));
-+    avahi_simple_poll_quit (simple_poll);
-+    return;
-+
-+  case AVAHI_BROWSER_NEW:
-+   /*
-+    * This object is new on the network.
-+    */
-+
-+    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+    {
-+     /*
-+      * This comes from the local machine so ignore it.
-+      */
-+
-+      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+    }
-+    else
-+    {
-+     /*
-+      * Create a device entry for it if it doesn't yet exist.
-+      */
-+
-+      get_device ((cups_array_t *)context, name, type, domain);
-+
-+     /*
-+      * Now look for a TXT entry.
-+      */
-+
-+      if (avahi_service_resolver_new (client, interface, protocol,
-+				      name, type, domain,
-+				      AVAHI_PROTO_UNSPEC, 0,
-+				      avahi_query_callback, context) == NULL)
-+      {
-+	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+		 name, avahi_strerror (avahi_client_errno (client)));
-+      }
-+    }
-+
-+    break;
-+
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'find_device()' - Find a device from its name and domain.
-+ */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+	     cups_txt_records_t *txt,
-+	     cups_device_t *dkey)
-+{
-+  cups_device_t	*device;
-+  char		*ptr;
-+
-+  for (device = cupsArrayFind(devices, dkey);
-        device;
-        device = cupsArrayNext(devices))
-   {
--    if (_cups_strcasecmp(device->name, dkey.name) ||
--        _cups_strcasecmp(device->domain, dkey.domain))
-+    if (_cups_strcasecmp(device->name, dkey->name) ||
-+        _cups_strcasecmp(device->domain, dkey->domain))
-     {
-       device = NULL;
-       break;
-     }
--    else if (device->type == dkey.type)
-+    else if (device->type == dkey->type)
-     {
-      /*
-       * Found it, pull out the priority and make and model from the TXT
-       * record and save it...
-       */
- 
--      const uint8_t	*data,		/* Pointer into data */
--			*datanext,	/* Next key/value pair */
--			*dataend;	/* End of entire TXT record */
--      uint8_t		datalen;	/* Length of current key/value pair */
--      char		key[256],	/* Key string */
--			value[256],	/* Value string */
--			make_and_model[512],
-+      char		make_and_model[512],
- 				      	/* Manufacturer and model */
- 			model[256],	/* Model */
--			device_id[2048];/* 1284 device ID */
--
-+			device_id[2048]; /* 1284 device ID */
- 
-       device_id[0]      = '\0';
-       make_and_model[0] = '\0';
- 
-       strcpy(model, "Unknown");
- 
--      for (data = rdata, dataend = data + rdlen;
--           data < dataend;
--           data = datanext)
-+      for (;;)
-       {
--       /*
--        * Read a key/value pair starting with an 8-bit length.  Since the
--	* length is 8 bits and the size of the key/value buffers is 256, we
--	* don't need to check for overflow...
--	*/
--
--        datalen = *data++;
--
--        if (!datalen || (data + datalen) > dataend)
--	  break;
--
--        datanext = data + datalen;
--
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
-+	char *key;
-+	char *value;
- 
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
--	          key, value);
--	}
--	else
--	{
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
--	          key);
--	  continue;
--	}
--
--        if (!_cups_strncasecmp(key, "usb_", 4))
-+	key = txt->key;
-+	value = txt->value;
-+        if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
- 	  * Add USB device ID information...
-@@ -861,6 +1267,10 @@ query_callback(
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -917,11 +1327,9 @@ query_callback(
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
-diff -up cups-1.5.3/cups/http-support.c.avahi-2-backend cups-1.5.3/cups/http-support.c
---- cups-1.5.3/cups/http-support.c.avahi-2-backend	2012-02-15 02:06:12.000000000 +0100
-+++ cups-1.5.3/cups/http-support.c	2012-05-15 17:04:51.045944634 +0200
-@@ -43,6 +43,10 @@
-  *   http_copy_decode()   - Copy and decode a URI.
-  *   http_copy_encode()   - Copy and encode a URI.
-  *   http_resolve_cb()    - Build a device URI for the given service name.
-+ *   avahi_resolve_uri_client_cb()
-+ *                        - Avahi client callback for resolving URI.
-+ *   avahi_resolve_uri_resolver_cb()
-+ *                        - Avahi resolver callback for resolving URI.
-  */
- 
- /*
-@@ -60,6 +64,11 @@
- #    include <sys/select.h>
- #  endif /* WIN32 */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -127,6 +136,24 @@ static void DNSSD_API	http_resolve_cb(DN
- 					void *context);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void	avahi_resolve_uri_client_cb(AvahiClient *client,
-+					    AvahiClientState state,
-+					    void *simple_poll);
-+static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+					      AvahiIfIndex interface,
-+					      AvahiProtocol protocol,
-+					      AvahiResolverEvent event,
-+					      const char *name,
-+					      const char *type,
-+					      const char *domain,
-+					      const char *host_name,
-+					      const AvahiAddress *address,
-+					      uint16_t port,
-+					      AvahiStringList *txt,
-+					      AvahiLookupResultFlags flags,
-+					      void *context);
-+#endif /* HAVE_AVAHI */
- 
- /*
-  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1434,6 +1461,9 @@ _httpResolveURI(
- 
-   if (strstr(hostname, "._tcp"))
-   {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+    char		*regtype,	/* Pointer to type in hostname */
-+			*domain;	/* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
- #  ifdef WIN32
- #    pragma comment(lib, "dnssd.lib")
-@@ -1452,6 +1482,17 @@ _httpResolveURI(
-     fd_set		input_set;	/* Input set for select() */
-     struct timeval	stimeout;	/* Timeout value for select() */
- #endif /* HAVE_POLL */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
-+
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-       fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
-@@ -1488,9 +1529,16 @@ _httpResolveURI(
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer   = resolved_uri;
-     uribuf.bufsize  = resolved_size;
-     uribuf.options  = options;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+    user_data.uribuf.options = options;
-+#endif
-+
-     resolved_uri[0] = '\0';
- 
-     DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
-@@ -1504,6 +1552,7 @@ _httpResolveURI(
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1611,6 +1660,36 @@ _httpResolveURI(
- 
-       DNSServiceRefDeallocate(ref);
-     }
-+#else /* HAVE_AVAHI */
-+    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+    {
-+      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+				      0, avahi_resolve_uri_client_cb,
-+				      &simple_poll, &error)) != NULL)
-+      {
-+	user_data.poll = simple_poll;
-+	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+					AVAHI_PROTO_UNSPEC, hostname,
-+					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+					avahi_resolve_uri_resolver_cb,
-+					&user_data) != NULL)
-+	{
-+	  avahi_simple_poll_loop (simple_poll);
-+
-+	 /*
-+	  * Collect the result.
-+	  */
-+
-+	  if (resolved_uri[0])
-+	    uri = resolved_uri;
-+	}
-+
-+	avahi_client_free (client);
-+      }
-+
-+      avahi_simple_poll_free (simple_poll);
-+    }
-+#endif /* HAVE_DNSSD */
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-     {
-@@ -1622,13 +1701,13 @@ _httpResolveURI(
-       fputs("STATE: -connecting-to-device,offline-report\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if ((options & _HTTP_RESOLVE_STDERR) && !uri)
-       _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
-@@ -1916,6 +1995,115 @@ http_resolve_cb(
- }
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+			     AvahiClientState state,
-+			     void *simple_poll)
-+{
-+  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+		"simple_poll=%p)\n", client, state, simple_poll));
-+
-+  /*
-+   * If the connection drops, quit.
-+   */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+    avahi_simple_poll_quit (simple_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
-+ *                                     URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+			       AvahiIfIndex interface,
-+			       AvahiProtocol protocol,
-+			       AvahiResolverEvent event,
-+			       const char *name,
-+			       const char *type,
-+			       const char *domain,
-+			       const char *host_name,
-+			       const AvahiAddress *address,
-+			       uint16_t port,
-+			       AvahiStringList *txt,
-+			       AvahiLookupResultFlags flags,
-+			       void *context)
-+{
-+  const char		*scheme;	/* URI scheme */
-+  char			rp[256];	/* Remote printer */
-+  AvahiStringList	*pair;
-+  char			*value;
-+  size_t		valueLen = 0;
-+  char			addr[AVAHI_ADDRESS_STR_MAX];
-+  struct
-+  {
-+    AvahiSimplePoll	*poll;
-+    _http_uribuf_t	uribuf;
-+  }		*poll_uribuf = context;
-+
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+		"port=%d, txt=%p, flags=%d, context=%p)\n",
-+		resolver, interface, protocol, event, name, type, domain,
-+		host_name, address, port, txt, flags, context));
-+
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    avahi_service_resolver_free (resolver);
-+    avahi_simple_poll_quit (poll_uribuf->poll);
-+    return;
-+  }
-+
-+ /*
-+  * Figure out the scheme from the full name...
-+  */
-+
-+  if (strstr(type, "_ipp."))
-+    scheme = "ipp";
-+  else if (strstr(type, "_printer."))
-+    scheme = "lpd";
-+  else if (strstr(type, "_pdl-datastream."))
-+    scheme = "socket";
-+  else
-+    scheme = "riousbprint";
-+
-+ /*
-+  * Extract the "remote printer key from the TXT record...
-+  */
-+
-+  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+  {
-+    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+    rp[0] = '/';
-+    memcpy (rp + 1, value, valueLen);
-+    rp[valueLen + 1] = '\0';
-+  }
-+  else
-+    rp[0] = '\0';
-+
-+ /*
-+  * Assemble the final device URI...
-+  */
-+
-+  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+		  poll_uribuf->uribuf.bufsize, scheme, NULL,
-+		  addr, port, rp);
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+		poll_uribuf->uribuf.buffer));
-+  avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $".
\ No newline at end of file
diff --git a/testing/cups/cups-avahi-3-timeouts.patch b/testing/cups/cups-avahi-3-timeouts.patch
deleted file mode 100644
index daf852a0f..000000000
--- a/testing/cups/cups-avahi-3-timeouts.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-diff -up cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.2/scheduler/cupsd.h
---- cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts	2011-05-11 23:17:34.000000000 +0100
-+++ cups-1.5.2/scheduler/cupsd.h	2012-03-14 15:06:36.509476983 +0000
-@@ -140,6 +140,15 @@ extern const char *cups_hstrerror(int);
- 
- typedef void (*cupsd_selfunc_t)(void *data);
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * Timeout callback function type...
-+ */
-+
-+typedef struct _cupsd_timeout_s cupsd_timeout_t;
-+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * Globals...
-@@ -173,6 +182,11 @@ VAR int			Launchd		VALUE(0);
- 					/* Running from launchd */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_AVAHI
-+VAR cups_array_t *Timeouts;		/* Timed callbacks for main loop */
-+#endif /* HAVE_AVAHI */
-+
-+
- 
- /*
-  * Prototypes...
-@@ -242,6 +256,20 @@ extern void		cupsdStopSelect(void);
- extern void		cupsdStartServer(void);
- extern void		cupsdStopServer(void);
- 
-+#ifdef HAVE_AVAHI
-+extern void     cupsdInitTimeouts(void);
-+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
-+					 cupsd_timeoutfunc_t cb,
-+					 void *data);
-+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
-+extern void     cupsdRunTimeout (cupsd_timeout_t *timeout);
-+extern void     cupsdUpdateTimeout (cupsd_timeout_t *timeout,
-+				    const struct timeval *tv);
-+extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
-+#endif /* HAVE_AVAHI */
-+
-+extern int	cupsdRemoveFile(const char *filename);
-+
- 
- /*
-  * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
-diff -up cups-1.5.2/scheduler/main.c.avahi-3-timeouts cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.avahi-3-timeouts	2012-03-14 15:04:17.655305548 +0000
-+++ cups-1.5.2/scheduler/main.c	2012-03-14 15:06:36.511476986 +0000
-@@ -146,6 +146,10 @@ main(int  argc,				/* I - Number of comm
-   int			launchd_idle_exit;
- 					/* Idle exit on select timeout? */
- #endif	/* HAVE_LAUNCHD */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Next scheduled timed callback */
-+  long			tmo_delay;	/* Time before it must be called */
-+#endif /* HAVE_AVAHI */
- 
- 
- #ifdef HAVE_GETEUID
-@@ -535,6 +539,14 @@ main(int  argc,				/* I - Number of comm
- 
-   httpInitialize();
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * Initialize timed callback structures.
-+  */
-+
-+  cupsdInitTimeouts();
-+#endif /* HAVE_AVAHI */
-+
-   cupsdStartServer();
- 
-  /*
-@@ -874,6 +886,16 @@ main(int  argc,				/* I - Number of comm
-     }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+   /*
-+    * If a timed callback is due, run it.
-+    */
-+
-+    tmo = cupsdNextTimeout (&tmo_delay);
-+    if (tmo && tmo_delay == 0)
-+      cupsdRunTimeout (tmo);
-+#endif /* HAVE_AVAHI */
-+
- #ifndef __APPLE__
-    /*
-     * Update the network interfaces once a minute...
-@@ -1787,6 +1809,10 @@ select_timeout(int fds)			/* I - Number
-   cupsd_job_t		*job;		/* Job information */
-   cupsd_subscription_t	*sub;		/* Subscription information */
-   const char		*why;		/* Debugging aid */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Timed callback */
-+  long			tmo_delay;	/* Seconds before calling it */
-+#endif /* HAVE_AVAHI */
- 
- 
-  /*
-@@ -1829,6 +1855,19 @@ select_timeout(int fds)			/* I - Number
-   }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * See if there are any scheduled timed callbacks to run.
-+  */
-+
-+  if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL &&
-+      (now + tmo_delay) < timeout)
-+  {
-+    timeout = tmo_delay;
-+    why = "run a timed callback";
-+  }
-+#endif /* HAVE_AVAHI */
-+
-  /*
-   * Check whether we are accepting new connections...
-   */
-diff -up cups-1.5.2/scheduler/Makefile.avahi-3-timeouts cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.avahi-3-timeouts	2012-03-14 15:04:17.685305586 +0000
-+++ cups-1.5.2/scheduler/Makefile	2012-03-14 15:06:36.508476980 +0000
-@@ -39,7 +39,8 @@ CUPSDOBJS =	\
- 		server.o \
- 		statbuf.o \
- 		subscriptions.o \
--		sysman.o
-+		sysman.o \
-+		timeout.o
- LIBOBJS =	\
- 		filter.o \
- 		mime.o \
-diff -up cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts cups-1.5.2/scheduler/timeout.c
---- cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts	2012-03-14 15:06:36.552477037 +0000
-+++ cups-1.5.2/scheduler/timeout.c	2012-03-14 15:06:36.552477037 +0000
-@@ -0,0 +1,235 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Timeout functions for the Common UNIX Printing System (CUPS).
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *     Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS 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.
-+ *
-+ * Contents:
-+ *
-+ *   cupsdInitTimeouts()  - Initialise timeout structure.
-+ *   cupsdAddTimeout()    - Add a timed callback.
-+ *   cupsdNextTimeout()   - Find the next enabled timed callback.
-+ *   cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
-+ *   cupsdRemoveTimeout() - Discard a timed callback.
-+ *   compare_timeouts()   - Compare timed callbacks for array sorting.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+struct _cupsd_timeout_s
-+{
-+  struct timeval when;
-+  int enabled;
-+  cupsd_timeoutfunc_t callback;
-+  void *data;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+/*
-+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
-+ */
-+
-+static int
-+compare_addrs (void *p0, void *p1)
-+{
-+  if (p0 == p1)
-+    return (0);
-+  if (p0 < p1)
-+    return (-1);
-+  return (1);
-+}
-+
-+static int
-+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
-+{
-+  int addrsdiff = compare_addrs (p0, p1);
-+  int tvdiff;
-+
-+  if (addrsdiff == 0)
-+    return (0);
-+
-+  if (!p0->enabled || !p1->enabled)
-+  {
-+    if (!p0->enabled && !p1->enabled)
-+      return (addrsdiff);
-+
-+    return (p0->enabled ? -1 : 1);
-+  }
-+
-+  tvdiff = avahi_timeval_compare (&p0->when, &p1->when);
-+  if (tvdiff != 0)
-+    return (tvdiff);
-+
-+  return (addrsdiff);
-+}
-+
-+
-+/*
-+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
-+ */
-+
-+void
-+cupsdInitTimeouts(void)
-+{
-+  Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
-+}
-+
-+
-+/*
-+ * 'cupsdAddTimeout()' - Add a timed callback.
-+ */
-+
-+cupsd_timeout_t *				/* O - Timeout handle */
-+cupsdAddTimeout(const struct timeval *tv,	/* I - Absolute time */
-+		cupsd_timeoutfunc_t cb,		/* I - Callback function */
-+		void *data)			/* I - User data */
-+{
-+  cupsd_timeout_t *timeout;
-+
-+  timeout = malloc (sizeof(cupsd_timeout_t));
-+  if (timeout != NULL)
-+  {
-+    timeout->enabled = (tv != NULL);
-+    if (tv)
-+    {
-+      timeout->when.tv_sec = tv->tv_sec;
-+      timeout->when.tv_usec = tv->tv_usec;
-+    }
-+
-+    timeout->callback = cb;
-+    timeout->data = data;
-+    cupsArrayAdd (Timeouts, timeout);
-+  }
-+
-+  return timeout;
-+}
-+
-+
-+/*
-+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
-+ */
-+
-+cupsd_timeout_t *		/* O - Next enabled timeout or NULL */
-+cupsdNextTimeout(long *delay)	/* O - Seconds before scheduled */
-+{
-+  cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
-+  struct timeval curtime;
-+
-+  if (first && !first->enabled)
-+    first = NULL;
-+
-+  if (first && delay)
-+  {
-+    gettimeofday (&curtime, NULL);
-+    if (avahi_timeval_compare (&curtime, &first->when) > 0)
-+    {
-+      *delay = 0;
-+    } else {
-+      *delay = 1 + first->when.tv_sec - curtime.tv_sec;
-+      if (first->when.tv_usec < curtime.tv_usec)
-+	(*delay)--;
-+    }
-+  }
-+
-+  return (first);
-+}
-+
-+
-+/*
-+ * 'cupsdRunTimeout()' - Run a timed callback.
-+ */
-+
-+void
-+cupsdRunTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  if (!timeout)
-+    return;
-+  timeout->enabled = 0;
-+  if (!timeout->callback)
-+    return;
-+  timeout->callback (timeout, timeout->data);
-+}
-+
-+/*
-+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
-+ */
-+
-+void
-+cupsdUpdateTimeout(cupsd_timeout_t *timeout,	/* I - Timeout */
-+		   const struct timeval *tv)	/* I - Absolute time or NULL */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  timeout->enabled = (tv != NULL);
-+  if (tv)
-+  {
-+    timeout->when.tv_sec = tv->tv_sec;
-+    timeout->when.tv_usec = tv->tv_usec;
-+  }
-+  cupsArrayAdd (Timeouts, timeout);
-+}
-+
-+
-+/*
-+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
-+ */
-+
-+void
-+cupsdRemoveTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  free (timeout);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
diff --git a/testing/cups/cups-avahi-4-poll.patch b/testing/cups/cups-avahi-4-poll.patch
deleted file mode 100644
index d7fa5fd56..000000000
--- a/testing/cups/cups-avahi-4-poll.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-diff -up cups-1.5.2/scheduler/avahi.c.avahi-4-poll cups-1.5.2/scheduler/avahi.c
---- cups-1.5.2/scheduler/avahi.c.avahi-4-poll	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.c	2012-03-14 15:07:29.477542381 +0000
-@@ -0,0 +1,441 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS 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.
-+ *
-+ * Contents:
-+ *
-+ *   watch_read_cb         - Read callback for file descriptor
-+ *   watch_write_cb        - Write callback for file descriptor
-+ *   watched_fd_add_select() - Call cupsdAddSelect() as needed
-+ *   watch_new()           - Create a new file descriptor watch
-+ *   watch_free()          - Free a file descriptor watch
-+ *   watch_update()        - Update watched events for a file descriptor
-+ *   watch_get_events()    - Get events that happened for a file descriptor
-+ *   timeout_cb()          - Run a timed Avahi callback
-+ *   timeout_new()         - Set a wakeup time
-+ *   timeout_update()      - Update the expiration time for a timeout
-+ *   timeout_free()        - Free a timeout
-+ *   compare_watched_fds() - Compare watched file descriptors for array sorting
-+ *   avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
-+ *   avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
-+ *   avahi_cups_poll_get() - Get the abstract poll API structure
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+typedef struct
-+{
-+  AvahiCupsPoll *cups_poll;
-+
-+  int fd;
-+  AvahiWatchEvent occurred;
-+  cups_array_t *watches;
-+} cupsd_watched_fd_t;
-+
-+struct AvahiWatch
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  AvahiWatchEvent events;
-+  AvahiWatchCallback callback;
-+  void *userdata;
-+};
-+
-+struct AvahiTimeout
-+{
-+  AvahiCupsPoll *cups_poll;
-+  AvahiTimeoutCallback callback;
-+  void *userdata;
-+  cupsd_timeout_t *cupsd_timeout;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+static AvahiWatch *	watch_new(const AvahiPoll *api,
-+				  int fd,
-+				  AvahiWatchEvent events,
-+				  AvahiWatchCallback callback,
-+				  void *userdata);
-+static void		watch_free(AvahiWatch *watch);
-+static void		watch_update(AvahiWatch *watch,
-+				     AvahiWatchEvent events);
-+static AvahiWatchEvent	watch_get_events(AvahiWatch *watch);
-+
-+
-+/*
-+ * 'watch_read_cb' - Read callback for file descriptor
-+ */
-+
-+static void
-+watch_read_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_IN;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    if (watch->events & watched_fd->occurred)
-+    {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_IN, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_IN;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_write_cb' - Write callback for file descriptor
-+ */
-+
-+static void
-+watch_write_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_OUT;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    if (watch->events & watched_fd->occurred)
-+    {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_OUT, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_OUT;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
-+ */
-+
-+static int						/* O - Watches? */
-+watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
-+{
-+  AvahiWatch *watch;
-+  cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
-+  int any_watches = 0;
-+
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    any_watches = 1;
-+    if (watch->events & (AVAHI_WATCH_IN |
-+			     AVAHI_WATCH_ERR |
-+			     AVAHI_WATCH_HUP))
-+    {
-+      read_cb = (cupsd_selfunc_t)watch_read_cb;
-+      if (write_cb != NULL)
-+	break;
-+    }
-+
-+    if (watch->events & AVAHI_WATCH_OUT)
-+    {
-+      write_cb = (cupsd_selfunc_t)watch_write_cb;
-+      if (read_cb != NULL)
-+	break;
-+    }
-+  }
-+
-+  if (read_cb || write_cb)
-+    cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
-+  else
-+    cupsdRemoveSelect (watched_fd->fd);
-+
-+  return (any_watches);
-+}
-+
-+/*
-+ * 'watch_new' - Create a new file descriptor watch
-+ */
-+
-+static AvahiWatch *
-+watch_new (const AvahiPoll *api,
-+	   int fd,
-+	   AvahiWatchEvent events,
-+	   AvahiWatchCallback callback,
-+	   void *userdata)
-+{
-+  cupsd_watched_fd_t key, *watched_fd;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+  AvahiWatch *watch = malloc(sizeof(AvahiWatch));
-+  if (watch == NULL)
-+    return (NULL);
-+
-+  watch->events = events;
-+  watch->callback = callback;
-+  watch->userdata = userdata;
-+
-+  key.fd = fd;
-+  watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
-+  if (watched_fd == NULL)
-+  {
-+    watched_fd = malloc(sizeof(cupsd_watched_fd_t));
-+    if (watched_fd == NULL)
-+    {
-+      free (watch);
-+      return (NULL);
-+    }
-+
-+    watched_fd->fd = fd;
-+    watched_fd->occurred = 0;
-+    watched_fd->cups_poll = cups_poll;
-+    watched_fd->watches = cupsArrayNew (NULL, NULL);
-+    cupsArrayAdd (cups_poll->watched_fds, watched_fd);
-+  }
-+
-+  watch->watched_fd = watched_fd;
-+  cupsArrayAdd(watched_fd->watches, watch);
-+  watched_fd_add_select (watched_fd);
-+  return (watch);
-+}
-+
-+
-+/*
-+ * 'watch_free' - Free a file descriptor watch
-+ */
-+
-+static void
-+watch_free (AvahiWatch *watch)
-+{
-+  cupsd_watched_fd_t *watched_fd = watch->watched_fd;
-+  AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
-+
-+  cupsArrayRemove (watched_fd->watches, watch);
-+  free (watch);
-+
-+  if (!watched_fd_add_select (watched_fd))
-+  {
-+    /* No more watches */
-+    cupsArrayRemove (cups_poll->watched_fds, watched_fd);
-+    free (watched_fd);
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_update' - Update watched events for a file descriptor
-+ */
-+
-+static void
-+watch_update (AvahiWatch *watch,
-+	      AvahiWatchEvent events)
-+{
-+  watch->events = events;
-+  watched_fd_add_select (watch->watched_fd);
-+}
-+
-+
-+/*
-+ * 'watch_get_events' - Get events that happened for a file descriptor
-+ */
-+
-+static AvahiWatchEvent
-+watch_get_events (AvahiWatch *watch)
-+{
-+  return (watch->watched_fd->occurred);
-+}
-+
-+
-+/*
-+ * 'timeout_cb()' - Run a timed Avahi callback
-+ */
-+
-+static void
-+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
-+{
-+  AvahiTimeout *timeout = userdata;
-+  (timeout->callback) (timeout, timeout->userdata);
-+}
-+
-+
-+/*
-+ * 'timeout_new' - Set a wakeup time
-+ */
-+
-+static AvahiTimeout *
-+timeout_new (const AvahiPoll *api,
-+	     const struct timeval *tv,
-+	     AvahiTimeoutCallback callback,
-+	     void *userdata)
-+{
-+  AvahiTimeout *timeout;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+
-+  timeout = malloc(sizeof(AvahiTimeout));
-+  if (timeout == NULL)
-+    return (NULL);
-+
-+  timeout->cups_poll = cups_poll;
-+  timeout->callback = callback;
-+  timeout->userdata = userdata;
-+  timeout->cupsd_timeout = cupsdAddTimeout (tv,
-+					    (cupsd_timeoutfunc_t)timeout_cb,
-+					    timeout);
-+  cupsArrayAdd (cups_poll->timeouts, timeout);
-+  return (timeout);
-+}
-+
-+
-+/*
-+ * 'timeout_update' - Update the expiration time for a timeout
-+ */
-+
-+static void
-+timeout_update (AvahiTimeout *timeout,
-+		const struct timeval *tv)
-+{
-+  cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
-+}
-+
-+
-+/*
-+ * ' timeout_free' - Free a timeout
-+ */
-+
-+static void
-+timeout_free (AvahiTimeout *timeout)
-+{
-+  cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
-+  cupsdRemoveTimeout (timeout->cupsd_timeout);
-+  free (timeout);
-+}
-+
-+
-+/*
-+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
-+ */
-+static int
-+compare_watched_fds(cupsd_watched_fd_t *p0,
-+		    cupsd_watched_fd_t *p1)
-+{
-+  /*
-+   * Compare by fd (no two elements have the same fd)
-+   */
-+
-+  if (p0->fd == p1->fd)
-+    return 0;
-+
-+  return (p0->fd < p1->fd ? -1 : 1);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
-+ */
-+
-+AvahiCupsPoll *
-+avahi_cups_poll_new (void)
-+{
-+  AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
-+  if (cups_poll == NULL)
-+    return (NULL);
-+
-+  cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
-+					 NULL);
-+  cups_poll->timeouts = cupsArrayNew (NULL, NULL);
-+
-+  cups_poll->api.userdata = cups_poll;
-+  cups_poll->api.watch_new = watch_new;
-+  cups_poll->api.watch_free = watch_free;
-+  cups_poll->api.watch_update = watch_update;
-+  cups_poll->api.watch_get_events = watch_get_events;
-+
-+  cups_poll->api.timeout_new = timeout_new;
-+  cups_poll->api.timeout_update = timeout_update;
-+  cups_poll->api.timeout_free = timeout_free;
-+
-+  return (cups_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
-+ */
-+void
-+avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
-+       watched_fd;
-+       watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds))
-+    cupsArrayClear (watched_fd->watches);
-+
-+  cupsArrayClear (cups_poll->watched_fds);
-+  cupsArrayClear (cups_poll->timeouts);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_get' - Get the abstract poll API structure
-+ */
-+
-+const AvahiPoll *
-+avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
-+{
-+  return (&cups_poll->api);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
-diff -up cups-1.5.2/scheduler/avahi.h.avahi-4-poll cups-1.5.2/scheduler/avahi.h
---- cups-1.5.2/scheduler/avahi.h.avahi-4-poll	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.h	2012-03-14 15:07:29.477542381 +0000
-@@ -0,0 +1,69 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS 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.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_AUTHORIZATION_H
-+#  include <Security/Authorization.h>
-+#endif /* HAVE_AUTHORIZATION_H */
-+
-+
-+#ifdef HAVE_AVAHI
-+typedef struct
-+{
-+    AvahiPoll api;
-+    cups_array_t *watched_fds;
-+    cups_array_t *timeouts;
-+} AvahiCupsPoll;
-+#endif /* HAVE_AVAHI */
-+
-+/*
-+ * Prototypes...
-+ */
-+
-+#ifdef HAVE_AVAHI
-+extern AvahiCupsPoll *	avahi_cups_poll_new(void);
-+extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
-+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * End of "$Id$".
-+ */
-diff -up cups-1.5.2/scheduler/Makefile.avahi-4-poll cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.avahi-4-poll	2012-03-14 15:06:36.508476980 +0000
-+++ cups-1.5.2/scheduler/Makefile	2012-03-14 15:07:29.476542380 +0000
-@@ -17,6 +17,7 @@ include ../Makedefs
- 
- CUPSDOBJS =	\
- 		auth.o \
-+		avahi.o \
- 		banners.o \
- 		cert.o \
- 		classes.o \
diff --git a/testing/cups/cups-avahi-5-services.patch b/testing/cups/cups-avahi-5-services.patch
deleted file mode 100644
index 820b3c32b..000000000
--- a/testing/cups/cups-avahi-5-services.patch
+++ /dev/null
@@ -1,1272 +0,0 @@
-diff -up cups-1.5.2/cgi-bin/admin.c.avahi-5-services cups-1.5.2/cgi-bin/admin.c
---- cups-1.5.2/cgi-bin/admin.c.avahi-5-services	2011-08-17 22:01:53.000000000 +0100
-+++ cups-1.5.2/cgi-bin/admin.c	2012-03-14 15:08:25.701611799 +0000
-@@ -1643,7 +1643,7 @@ do_config_server(http_t *http)		/* I - H
-       else
- 	local_protocols[0] = '\0';
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
-       {
- 	if (local_protocols[0])
-@@ -1651,7 +1651,7 @@ do_config_server(http_t *http)		/* I - H
- 	else
- 	  strcat(local_protocols, "dnssd");
-       }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-       if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
-@@ -2718,9 +2718,9 @@ do_menu(http_t *http)			/* I - HTTP conn
- #endif /* HAVE_GSSAPI */
-   cgiSetVariable("KERBEROS", "");
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cgiSetVariable("HAVE_DNSSD", "1");
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-   cgiSetVariable("HAVE_LDAP", "1");
-diff -up cups-1.5.2/scheduler/avahi.h.avahi-5-services cups-1.5.2/scheduler/avahi.h
---- cups-1.5.2/scheduler/avahi.h.avahi-5-services	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.h	2012-03-14 15:08:25.701611799 +0000
-@@ -3,7 +3,7 @@
-  *
-  *   Avahi poll implementation for the CUPS scheduler.
-  *
-- *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Copyright (C) 2010, 2011, 2012 Red Hat, Inc.
-  *   Authors:
-  *    Tim Waugh <twaugh@redhat.com>
-  *
-@@ -32,37 +32,40 @@
-  *   OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#include <config.h>
-+#ifndef _CUPS_AVAHI_H_
-+#  define _CUPS_AVAHI_H_
- 
--#ifdef HAVE_AVAHI
--#  include <avahi-client/client.h>
--#  include <avahi-client/publish.h>
--#endif /* HAVE_AVAHI */
-+/*
-+ * Include necessary headers...
-+ */
- 
--#ifdef HAVE_AUTHORIZATION_H
--#  include <Security/Authorization.h>
--#endif /* HAVE_AUTHORIZATION_H */
-+#  include <config.h>
- 
-+#  ifdef HAVE_AVAHI
-+#    include <avahi-client/client.h>
-+#    include <avahi-client/publish.h>
-+#  endif /* HAVE_AVAHI */
- 
--#ifdef HAVE_AVAHI
-+#  ifdef HAVE_AVAHI
- typedef struct
- {
-     AvahiPoll api;
-     cups_array_t *watched_fds;
-     cups_array_t *timeouts;
- } AvahiCupsPoll;
--#endif /* HAVE_AVAHI */
-+#  endif /* HAVE_AVAHI */
- 
- /*
-  * Prototypes...
-  */
- 
--#ifdef HAVE_AVAHI
-+#  ifdef HAVE_AVAHI
- extern AvahiCupsPoll *	avahi_cups_poll_new(void);
- extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
- extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
--#endif /* HAVE_AVAHI */
-+#  endif /* HAVE_AVAHI */
- 
-+#endif /* !_CUPS_AVAHI_H_ */
- 
- /*
-  * End of "$Id$".
-diff -up cups-1.5.2/scheduler/client.c.avahi-5-services cups-1.5.2/scheduler/client.c
---- cups-1.5.2/scheduler/client.c.avahi-5-services	2012-01-13 23:00:22.000000000 +0000
-+++ cups-1.5.2/scheduler/client.c	2012-03-14 15:08:25.703611797 +0000
-@@ -4989,7 +4989,7 @@ valid_host(cupsd_client_t *con)		/* I -
- 	    !strncmp(host, "[::1]:", 6));
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4998,7 +4998,7 @@ valid_host(cupsd_client_t *con)		/* I -
-       (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
-        !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-  /*
-   * Check if the hostname is an IP address...
-diff -up cups-1.5.2/scheduler/conf.c.avahi-5-services cups-1.5.2/scheduler/conf.c
---- cups-1.5.2/scheduler/conf.c.avahi-5-services	2012-03-14 15:04:17.636305526 +0000
-+++ cups-1.5.2/scheduler/conf.c	2012-03-14 15:08:25.706611803 +0000
-@@ -652,7 +652,7 @@ cupsdReadConfiguration(void)
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
- #endif /* HAVE_DNSSD */
- 
-diff -up cups-1.5.2/scheduler/dirsvc.c.avahi-5-services cups-1.5.2/scheduler/dirsvc.c
---- cups-1.5.2/scheduler/dirsvc.c.avahi-5-services	2012-03-14 15:04:17.674305572 +0000
-+++ cups-1.5.2/scheduler/dirsvc.c	2012-03-14 15:08:25.709611806 +0000
-@@ -27,6 +27,7 @@
-  *   ldap_connect()             - Start new LDAP connection
-  *   ldap_reconnect()           - Reconnect to LDAP Server
-  *   ldap_disconnect()          - Disconnect from LDAP Server
-+ *   cupsdStartAvahiClient()    - Start an Avahi client if needed
-  *   cupsdStartBrowsing()       - Start sending and receiving broadcast
-  *                                information.
-  *   cupsdStartPolling()        - Start polling servers as needed.
-@@ -40,11 +41,12 @@
-  *   dequote()                  - Remote quotes from a string.
-  *   dnssdAddAlias()            - Add a DNS-SD alias name.
-  *   dnssdBuildTxtRecord()      - Build a TXT record from printer info.
-- *   dnssdComparePrinters()     - Compare the registered names of two printers.
-  *   dnssdDeregisterPrinter()   - Stop sending broadcast information for a
-  *                                printer.
-  *   dnssdPackTxtRecord()       - Pack an array of key/value pairs into the TXT
-  *                                record format.
-+ *   avahiPackTxtRecord()       - Pack an array of key/value pairs into an
-+ *                                AvahiStringList.
-  *   dnssdRegisterCallback()    - DNSServiceRegister callback.
-  *   dnssdRegisterPrinter()     - Start sending broadcast information for a
-  *                                printer or update the broadcast contents.
-@@ -83,6 +85,7 @@
-  */
- 
- #include "cupsd.h"
-+#include <assert.h>
- #include <grp.h>
- 
- #ifdef HAVE_DNSSD
-@@ -97,6 +100,17 @@
- #    endif /* HAVE_SYSTEMCONFIGURATION */
- #  endif /* __APPLE__ */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/domain.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+#ifdef HAVE_DNSSD
-+typedef char *cupsd_txt_record_t;
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+typedef AvahiStringList *cupsd_txt_record_t;
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -159,27 +173,38 @@ static void	update_polling(void);
- static void	update_smb(int onoff);
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-+					      int for_lpd);
-+static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
-+static void	dnssdRegisterPrinter(cupsd_printer_t *p);
-+static void	dnssdStop(void);
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
- #ifdef HAVE_DNSSD
- #  ifdef HAVE_COREFOUNDATION
- static void	dnssdAddAlias(const void *key, const void *value,
- 		              void *context);
- #  endif /* HAVE_COREFOUNDATION */
--static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
--		                     int for_lpd);
--static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
--static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
--static char	*dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
--		                    int count);
- static void	dnssdRegisterCallback(DNSServiceRef sdRef,
- 		                      DNSServiceFlags flags,
- 				      DNSServiceErrorType errorCode,
- 				      const char *name, const char *regtype,
- 				      const char *domain, void *context);
--static void	dnssdRegisterPrinter(cupsd_printer_t *p);
--static void	dnssdStop(void);
- static void	dnssdUpdate(void);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
-+					   int count);
-+static void	avahi_entry_group_cb (AvahiEntryGroup *group,
-+				      AvahiEntryGroupState state,
-+				      void *userdata);
-+static void	avahi_client_cb (AvahiClient *client,
-+				 AvahiClientState state,
-+				 void *userdata);
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LDAP
- static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
- 		{
-@@ -283,10 +308,10 @@ cupsdDeregisterPrinter(
-     ldap_dereg_printer(p);
- #endif /* HAVE_LDAP */
- 
--#ifdef HAVE_DNSSD
--  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdDeregisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -702,10 +727,10 @@ cupsdRegisterPrinter(cupsd_printer_t *p)
-     slpRegisterPrinter(p); */
- #endif /* HAVE_LIBSLP */
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdRegisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -1419,6 +1444,36 @@ ldap_disconnect(LDAP *ld)		/* I - LDAP h
- #endif /* HAVE_LDAP */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
-+ */
-+
-+void
-+cupsdStartAvahiClient(void)
-+{
-+  int error = 0;
-+
-+  if (!AvahiCupsClient && !AvahiCupsClientConnecting)
-+  {
-+    if (!AvahiCupsPollHandle)
-+      AvahiCupsPollHandle = avahi_cups_poll_new ();
-+
-+    if (AvahiCupsPollHandle)
-+    {
-+      if (avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
-+			    AVAHI_CLIENT_NO_FAIL,
-+			    avahi_client_cb, NULL,
-+			    &error) != NULL)
-+	AvahiCupsClientConnecting = 1;
-+      else
-+	cupsdLogMessage (CUPSD_LOG_WARN, "Avahi client failed: %d", error);
-+    }
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+  
- /*
-  * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
-  */
-@@ -1542,13 +1597,16 @@ cupsdStartBrowsing(void)
-   else
-     BrowseSocket = -1;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
-   {
-+#ifdef HAVE_DNSSD
-     DNSServiceErrorType error;		/* Error from service creation */
-+#endif /* HAVE_DNSSD */
-     cupsd_listener_t	*lis;		/* Current listening socket */
- 
- 
-+#ifdef HAVE_DNSSD
-    /*
-     * First create a "master" connection for all registrations...
-     */
-@@ -1573,6 +1631,7 @@ cupsdStartBrowsing(void)
-       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
- 
-       cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
-+#endif /* HAVE_DNSSD */
- 
-      /*
-       * Then get the port we use for registrations.  If we are not listening
-@@ -1598,17 +1657,23 @@ cupsdStartBrowsing(void)
-       */
- 
-       if (BrowseRemoteProtocols & BROWSE_DNSSD)
--        DNSSDPrinters = cupsArrayNew((cups_array_func_t)dnssdComparePrinters,
--	                             NULL);
-+	  DNSSDPrinters = cupsArrayNew(NULL, NULL);
- 
-      /*
-       * Set the computer name and register the web interface...
-       */
- 
-       cupsdUpdateDNSSDName();
-+
-+#ifdef HAVE_AVAHI
-+      cupsdStartAvahiClient ();
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_DNSSD
-     }
--  }
- #endif /* HAVE_DNSSD */
-+  }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-@@ -1834,10 +1899,10 @@ cupsdStopBrowsing(void)
-     BrowseSocket = -1;
-   }
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdStop();
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
-@@ -1902,7 +1967,7 @@ cupsdStopPolling(void)
- }
- 
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
-  */
-@@ -1910,8 +1975,14 @@ cupsdStopPolling(void)
- void
- cupsdUpdateDNSSDName(void)
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType error;		/* Error from service creation */
-   char		webif[1024];		/* Web interface share name */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		ret;			/* Error from service creation */
-+  char		webif[AVAHI_LABEL_MAX];	/* Web interface share name */
-+#endif /* HAVE_AVAHI */
- #  ifdef HAVE_SYSTEMCONFIGURATION
-   SCDynamicStoreRef sc;			/* Context for dynamic store */
-   CFDictionaryRef btmm;			/* Back-to-My-Mac domains */
-@@ -2042,6 +2113,7 @@ cupsdUpdateDNSSDName(void)
-     else
-       strlcpy(webif, "CUPS Web Interface", sizeof(webif));
- 
-+#ifdef HAVE_DNSSD
-     if (WebIFRef)
-       DNSServiceRefDeallocate(WebIFRef);
- 
-@@ -2054,9 +2126,45 @@ cupsdUpdateDNSSDName(void)
- 				    NULL)) != kDNSServiceErr_NoError)
-       cupsdLogMessage(CUPSD_LOG_ERROR,
- 		      "DNS-SD web interface registration failed: %d", error);
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+    if (!AvahiCupsClient)
-+     /*
-+      * Client not yet running.
-+      */
-+      return;
-+
-+    if (AvahiWebIFGroup)
-+      avahi_entry_group_reset (AvahiWebIFGroup);
-+    else
-+      AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
-+					       avahi_entry_group_cb,
-+					       NULL);
-+
-+    if (AvahiWebIFGroup)
-+    {
-+      ret = avahi_entry_group_add_service (AvahiWebIFGroup,
-+					   AVAHI_IF_UNSPEC,
-+					   AVAHI_PROTO_UNSPEC,
-+					   0, /* flags */
-+					   webif, /* name */
-+					   "_http._tcp", /* type */
-+					   NULL, /* domain */
-+					   NULL, /* host */
-+					   DNSSDPort, /* port */
-+					   "path=/", NULL);
-+      if (ret == 0)
-+	ret = avahi_entry_group_commit (AvahiWebIFGroup);
-+
-+      if (ret != 0)
-+	cupsdLogMessage (CUPSD_LOG_ERROR,
-+			 "Avahi web interface registration failed: %d", ret);
-+    }
-+#endif /* HAVE_AVAHI */
-   }
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
- #ifdef HAVE_LDAP
-@@ -2334,13 +2442,15 @@ dnssdAddAlias(const void *key,		/* I - K
-                     "Bad Back to My Mac domain in dynamic store!");
- }
- #  endif /* HAVE_COREFOUNDATION */
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
-  */
- 
--static char *				/* O - TXT record */
-+static cupsd_txt_record_t		/* O - TXT record */
- dnssdBuildTxtRecord(
-     int             *txt_len,		/* O - TXT record length */
-     cupsd_printer_t *p,			/* I - Printer information */
-@@ -2379,7 +2489,12 @@ dnssdBuildTxtRecord(
-   keyvalue[i  ][0] = "ty";
-   keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
- 
--  snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
-+  snprintf(admin_hostname, sizeof(admin_hostname),
-+	   "%s.local"
-+#ifdef HAVE_DNSSD
-+	   "." /* terminating dot no good for Avahi */
-+#endif /* HAVE_DNSSD */
-+	   , DNSSDHostName);
-   httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
-                    "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
- 		   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-@@ -2462,19 +2577,12 @@ dnssdBuildTxtRecord(
-   * Then pack them into a proper txt record...
-   */
- 
-+#ifdef HAVE_DNSSD
-   return (dnssdPackTxtRecord(txt_len, keyvalue, i));
--}
--
--
--/*
-- * 'dnssdComparePrinters()' - Compare the registered names of two printers.
-- */
--
--static int				/* O - Result of comparison */
--dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
--                     cupsd_printer_t *b)/* I - Second printer */
--{
--  return (_cups_strcasecmp(a->reg_name, b->reg_name));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  return (avahiPackTxtRecord(keyvalue, i));
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2489,6 +2597,10 @@ dnssdDeregisterPrinter(
- {
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-  /*
-   * Closing the socket deregisters the service
-   */
-@@ -2524,6 +2636,24 @@ dnssdDeregisterPrinter(
-     free(p->printer_txt);
-     p->printer_txt = NULL;
-   }
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+  if (p->avahi_group)
-+    {
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+
-+      if (p->ipp_txt)
-+	avahi_string_list_free (p->ipp_txt);
-+
-+      if (p->printer_txt)
-+	avahi_string_list_free (p->printer_txt);
-+
-+      p->ipp_txt = p->printer_txt = NULL;
-+    }
-+#endif /* HAVE_AVAHI */
- 
-  /*
-   * Remove the printer from the array of DNS-SD printers, then clear the
-@@ -2533,8 +2663,10 @@ dnssdDeregisterPrinter(
-   cupsArrayRemove(DNSSDPrinters, p);
-   cupsdClearString(&p->reg_name);
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
-  *                          TXT record format.
-@@ -2644,8 +2776,10 @@ dnssdRegisterCallback(
-     LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
-   }
- }
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
-  *		              or update the broadcast contents.
-@@ -2654,20 +2788,40 @@ dnssdRegisterCallback(
- static void
- dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType	se;		/* dnssd errors */
-   char			*ipp_txt,	/* IPP TXT record buffer */
- 			*printer_txt,	/* LPD TXT record buffer */
--			name[1024],	/* Service name */
--			*nameptr;	/* Pointer into name */
-+			name[1024];	/* Service name */
-   int			ipp_len,	/* IPP TXT record length */
- 			printer_len,	/* LPD TXT record length */
- 			printer_port;	/* LPD port number */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int			ret;		/* Error code */
-+  AvahiStringList	*ipp_txt,	/* IPP TXT record */
-+			*printer_txt;	/* LPD TXT record */
-+  char			name[AVAHI_LABEL_MAX],	/* Service name */
-+			fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
-+  char			*regtype_copy,	/* Writeable copy of reg type */
-+			*subtype,	/* Current service sub type */
-+			*nextsubtype;	/* Next service sub type */
-+#endif /* HAVE_AVAHI */
-+  char			*nameptr;	/* Pointer into name */
-   const char		*regtype;	/* Registration type */
- 
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-                   !p->ipp_ref ? "new" : "update");
--
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-+		  !p->avahi_group ? "new" : "update");
-+#endif /* HAVE_AVAHI */
-  /*
-   * If per-printer sharing was just disabled make sure we're not
-   * registered before returning.
-@@ -2686,12 +2840,36 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
-   if (p->info && strlen(p->info) > 0)
-   {
-     if (DNSSDComputerName)
--      snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
-+    {
-+     /*
-+      * Make sure there is room for at least 15 characters of
-+      * DNSSDComputerName.
-+      */
-+
-+      assert(sizeof(name) >= 15 + 4);
-+      nameptr = name + strlcpy(name, p->info,
-+			       sizeof(name) - 4 -
-+			       strnlen(DNSSDComputerName, 15));
-+      nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+      strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+    }
-     else
-       strlcpy(name, p->info, sizeof(name));
-   }
-   else if (DNSSDComputerName)
--    snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
-+  {
-+   /*
-+    * Make sure there is room for at least 15 characters of
-+    * DNSSDComputerName.
-+    */
-+
-+    assert(sizeof(name) >= 15 + 4);
-+    nameptr = name + strlcpy(name, p->info,
-+			     sizeof(name) - 4 -
-+			     strnlen(DNSSDComputerName, 15));
-+    nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+    strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+  }
-   else
-     strlcpy(name, p->name, sizeof(name));
- 
-@@ -2712,6 +2890,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
-   * Register IPP and (optionally) LPD...
-   */
- 
-+#ifdef HAVE_DNSSD
-   ipp_len = 0;				/* anti-compiler-warning-code */
-   ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
- 
-@@ -2884,6 +3063,209 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
- 
-   if (printer_txt)
-     free(printer_txt);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  if (!AvahiCupsClient)
-+   /*
-+    * Client not running yet.  The client callback will call us again later.
-+    */
-+    return;
-+
-+  ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
-+  printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
-+  regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
-+
-+  if (p->avahi_group && p->ipp_txt && ipp_txt &&
-+      !avahi_string_list_equal (p->ipp_txt, ipp_txt))
-+  {
-+   /*
-+    * Update the existing registration...
-+    */
-+
-+    avahi_string_list_free (p->ipp_txt);
-+
-+    if (p->printer_txt)
-+      avahi_string_list_free (p->printer_txt);
-+
-+   /*
-+    * Update the service group entry.
-+    */
-+
-+    regtype_copy = strdup (regtype);
-+    subtype = strchr (regtype_copy, ',');
-+    if (subtype)
-+      *subtype = '\0';
-+
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Updating TXT record for %s (%s)", name, regtype_copy);
-+    ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+						       AVAHI_IF_UNSPEC,
-+						       AVAHI_PROTO_UNSPEC,
-+						       0, name,
-+						       regtype_copy,
-+						       NULL, ipp_txt);
-+    free (regtype_copy);
-+
-+    if (ret < 0)
-+      goto update_failed;
-+
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+							 AVAHI_IF_UNSPEC,
-+							 AVAHI_PROTO_UNSPEC,
-+							 0, name,
-+							 "_printer._tcp", NULL,
-+							 printer_txt);
-+      if (ret < 0)
-+	goto update_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+    if (ret < 0)
-+    {
-+    update_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to update TXT record for %s: %d",
-+		       name, ret);
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (!p->avahi_group)
-+  {
-+   /*
-+    * Initial registration.  Use the _fax subtype for fax queues...
-+    */
-+
-+    p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
-+					    avahi_entry_group_cb,
-+					    p);
-+
-+    cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		    "Registering Avahi printer %s with name \"%s\" and "
-+		    "type \"%s\"", p->name, name, regtype);
-+
-+    if (!p->avahi_group)
-+    {
-+      ret = 0;
-+      goto add_failed;
-+    }
-+
-+   /*
-+    * Add each service type (DNSSDRegType may contain several,
-+    * separated by commas).
-+    */
-+
-+    subtype = regtype_copy = strdup (regtype);
-+    while (subtype && *subtype)
-+    {
-+      nextsubtype = strchr (subtype, ',');
-+      if (nextsubtype)
-+	*nextsubtype++ = '\0';
-+
-+      if (subtype == regtype_copy)
-+      {
-+       /*
-+	* Main type entry.
-+	*/
-+
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, regtype_copy);
-+	ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						    AVAHI_IF_UNSPEC,
-+						    AVAHI_PROTO_UNSPEC,
-+						    0, name, regtype_copy,
-+						    NULL, NULL,
-+						    DNSSDPort,
-+						    ipp_txt);
-+      }
-+      else
-+      {
-+       /*
-+	* Sub-type entry.
-+	*/
-+
-+	snprintf (fullsubtype, sizeof(fullsubtype),
-+		  "%s._sub.%s", subtype, regtype_copy);
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, fullsubtype);
-+	ret = avahi_entry_group_add_service_subtype (p->avahi_group,
-+						     AVAHI_IF_UNSPEC,
-+						     AVAHI_PROTO_UNSPEC,
-+						     0, name,
-+						     regtype_copy,
-+						     NULL, fullsubtype);
-+      }
-+
-+      if (ret < 0)
-+      {
-+	free (regtype_copy);
-+	goto add_failed;
-+      }
-+
-+      subtype = nextsubtype;
-+    }
-+
-+    free (regtype_copy);
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		      "Registering Avahi printer %s with name \"%s\" and "
-+		      "type \"_printer._tcp\"", p->name, name);
-+
-+      ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						  AVAHI_IF_UNSPEC,
-+						  AVAHI_PROTO_UNSPEC,
-+						  0, name,
-+						  "_printer._tcp", NULL, NULL,
-+						  515,
-+						  printer_txt);
-+      if (ret < 0)
-+	goto add_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+
-+    if (ret < 0)
-+    {
-+    add_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to add Avahi entry for %s: %d",
-+		       name, ret);
-+      if (p->avahi_group)
-+      {
-+	avahi_entry_group_reset (p->avahi_group);
-+	avahi_entry_group_free (p->avahi_group);
-+	p->avahi_group = NULL;
-+      }
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (ipp_txt)
-+    avahi_string_list_free (ipp_txt);
-+
-+  if (printer_txt)
-+    avahi_string_list_free (printer_txt);
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2896,6 +3278,10 @@ dnssdStop(void)
- {
-   cupsd_printer_t	*p;		/* Current printer */
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * De-register the individual printers
-@@ -2910,12 +3296,23 @@ dnssdStop(void)
-   * Shutdown the rest of the service refs...
-   */
- 
-+#ifdef HAVE_DNSSD
-   if (WebIFRef)
-   {
-     DNSServiceRefDeallocate(WebIFRef);
-     WebIFRef = NULL;
-   }
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  if (AvahiWebIFGroup)
-+  {
-+    avahi_entry_group_reset (AvahiWebIFGroup);
-+    avahi_entry_group_free (AvahiWebIFGroup);
-+    AvahiWebIFGroup = NULL;
-+  }
-+#endif /* HAVE_AVAHI */
- 
-+#ifdef HAVE_DNSSD
-   if (RemoteRef)
-   {
-     DNSServiceRefDeallocate(RemoteRef);
-@@ -2926,14 +3323,17 @@ dnssdStop(void)
- 
-   DNSServiceRefDeallocate(DNSSDRef);
-   DNSSDRef = NULL;
-+#endif /* HAVE_DNSSD */
- 
-   cupsArrayDelete(DNSSDPrinters);
-   DNSSDPrinters = NULL;
- 
-   DNSSDPort = 0;
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdUpdate()' - Handle DNS-SD queries.
-  */
-@@ -2955,6 +3355,153 @@ dnssdUpdate(void)
- #endif /* HAVE_DNSSD */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
-+ *                          AvahiStringList.
-+ */
-+
-+static AvahiStringList *		/* O - new string list */
-+avahiPackTxtRecord(char *keyvalue[][2],	/* I - Table of key value pairs */
-+		   int count)		/* I - Number of items in table */
-+{
-+  AvahiStringList *strlst = NULL;
-+  char **elements;
-+  size_t len;
-+  int i = 0;
-+
-+  elements = malloc ((1 + count) * sizeof (char *));
-+  if (!elements)
-+    goto cleanup;
-+
-+  for (i = 0; i < count; i++)
-+    {
-+      len = (1 + strlen (keyvalue[i][0]) +
-+	     (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
-+      elements[i] = malloc (len * sizeof (char));
-+      if (!elements[i])
-+	goto cleanup;
-+
-+      snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
-+    }
-+
-+  strlst = avahi_string_list_new_from_array ((const char **) elements, count);
-+
-+cleanup:
-+  while (--i >= 0)
-+    free (elements[i]);
-+
-+  free (elements);
-+  return (strlst);
-+}
-+
-+
-+/*
-+ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
-+ */
-+static void
-+avahi_entry_group_cb (AvahiEntryGroup *group,
-+		      AvahiEntryGroupState state,
-+		      void *userdata)
-+{
-+  char *name;
-+
-+  if (userdata)
-+    name = ((cupsd_printer_t *) userdata)->reg_name;
-+  else
-+    name = "CUPS web interface";
-+
-+  switch (state)
-+  {
-+  case AVAHI_ENTRY_GROUP_UNCOMMITED:
-+  case AVAHI_ENTRY_GROUP_REGISTERING:
-+    break;
-+
-+  case AVAHI_ENTRY_GROUP_ESTABLISHED:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group established for %s", name);
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group %s has state %d",
-+		     name, state);
-+    break;
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_client_cb()' - Avahi client callback function.
-+ */
-+static void
-+avahi_client_cb (AvahiClient *client,
-+		 AvahiClientState state,
-+		 void *userdata)
-+{
-+  cupsd_printer_t *printer;
-+  switch (state)
-+  {
-+  case AVAHI_CLIENT_S_RUNNING:
-+   /*
-+    * Avahi client started successfully.
-+    */
-+    AvahiCupsClient = client;
-+    AvahiCupsClientConnecting = 0;
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
-+
-+    cupsdUpdateDNSSDName ();
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
-+	  (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
-+			      CUPS_PRINTER_SCANNER))) && printer->shared)
-+	dnssdRegisterPrinter (printer);
-+
-+    break;
-+
-+  case AVAHI_CLIENT_CONNECTING:
-+   /*
-+    * No Avahi daemon, client is waiting.
-+    */
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
-+    break;
-+
-+  case AVAHI_CLIENT_S_REGISTERING:
-+    /*
-+     * Not yet registered.
-+     */
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client registering");
-+    break;
-+
-+  case AVAHI_CLIENT_FAILURE:
-+   /*
-+    * Avahi client failed, close it to allow a clean restart.
-+    */
-+    cupsdLogMessage (CUPSD_LOG_ERROR,
-+		     "Avahi client failed, "
-+		     "closing client to allow a clean restart");
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      dnssdDeregisterPrinter (printer);
-+
-+    avahi_client_free(client);
-+    AvahiCupsClientConnecting = 0;
-+    AvahiCupsClient = NULL;
-+
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
-  * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
-  */
-diff -up cups-1.5.2/scheduler/dirsvc.h.avahi-5-services cups-1.5.2/scheduler/dirsvc.h
---- cups-1.5.2/scheduler/dirsvc.h.avahi-5-services	2011-03-21 02:12:14.000000000 +0000
-+++ cups-1.5.2/scheduler/dirsvc.h	2012-03-14 15:08:25.711611808 +0000
-@@ -31,6 +31,10 @@
- #  endif /* HAVE_LDAP_SSL_H */
- #endif /* HAVE_LDAP */
- 
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
- /*
-  * Browse protocols...
-  */
-@@ -131,19 +135,22 @@ VAR int			PollPipe	VALUE(0);
- VAR cupsd_statbuf_t	*PollStatusBuffer VALUE(NULL);
- 					/* Status buffer for pollers */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- VAR char		*DNSSDComputerName VALUE(NULL),
- 					/* Computer/server name */
- 			*DNSSDHostName	VALUE(NULL),
- 					/* Hostname */
- 			*DNSSDRegType VALUE(NULL);
- 					/* Bonjour registration type */
--VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
--					/* List of dynamic ServerAlias's */
- VAR int			DNSSDPort	VALUE(0);
- 					/* Port number to register */
- VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
- 					/* Printers we have registered */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
-+#ifdef HAVE_DNSSD
-+VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
-+					/* List of dynamic ServerAlias's */
- VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
- 					/* Master DNS-SD service reference */
- 			WebIFRef	VALUE(NULL),
-@@ -152,6 +159,17 @@ VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
- 					/* Remote printer browse reference */
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+VAR AvahiCupsPoll	*AvahiCupsPollHandle	VALUE(NULL);
-+					/* AvahiCupsPoll object */
-+VAR AvahiClient		*AvahiCupsClient	VALUE(NULL);
-+					/* AvahiClient object */
-+VAR int			AvahiCupsClientConnecting	VALUE(0);
-+					/* Is AvahiClient object connecting? */
-+VAR AvahiEntryGroup	*AvahiWebIFGroup	VALUE(NULL);
-+					/* Web interface entry group */
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LIBSLP
- VAR SLPHandle		BrowseSLPHandle	VALUE(NULL);
- 					/* SLP API handle */
-@@ -195,13 +213,14 @@ extern void	cupsdRegisterPrinter(cupsd_p
- extern void	cupsdRestartPolling(void);
- extern void	cupsdSaveRemoteCache(void);
- extern void	cupsdSendBrowseList(void);
-+extern void	cupsdStartAvahiClient(void);
- extern void	cupsdStartBrowsing(void);
- extern void	cupsdStartPolling(void);
- extern void	cupsdStopBrowsing(void);
- extern void	cupsdStopPolling(void);
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- extern void	cupsdUpdateDNSSDName(void);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LDAP
- extern void	cupsdUpdateLDAPBrowse(void);
- #endif /* HAVE_LDAP */
-diff -up cups-1.5.2/scheduler/ipp.c.avahi-5-services cups-1.5.2/scheduler/ipp.c
---- cups-1.5.2/scheduler/ipp.c.avahi-5-services	2012-03-14 15:04:17.665305560 +0000
-+++ cups-1.5.2/scheduler/ipp.c	2012-03-14 15:08:25.715611813 +0000
-@@ -6099,7 +6099,7 @@ copy_printer_attrs(
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -6109,7 +6109,7 @@ copy_printer_attrs(
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -up cups-1.5.2/scheduler/main.c.avahi-5-services cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.avahi-5-services	2012-03-14 15:06:36.511476986 +0000
-+++ cups-1.5.2/scheduler/main.c	2012-03-14 15:08:25.718611817 +0000
-@@ -120,6 +120,10 @@ main(int  argc,				/* I - Number of comm
-   cupsd_listener_t	*lis;		/* Current listener */
-   time_t		current_time,	/* Current time */
- 			activity,	/* Client activity timer */
-+#ifdef HAVE_AVAHI
-+			avahi_client_time, /* Time for next Avahi client
-+					      check */
-+#endif /* HAVE_AVAHI */
- 			browse_time,	/* Next browse send time */
- 			senddoc_time,	/* Send-Document time */
- 			expire_time,	/* Subscription expire time */
-@@ -672,6 +676,9 @@ main(int  argc,				/* I - Number of comm
-   */
- 
-   current_time  = time(NULL);
-+#ifdef HAVE_AVAHI
-+  avahi_client_time = current_time;
-+#endif /* HAVE_AVAHI */
-   browse_time   = current_time;
-   event_time    = current_time;
-   expire_time   = current_time;
-@@ -894,6 +901,16 @@ main(int  argc,				/* I - Number of comm
-     tmo = cupsdNextTimeout (&tmo_delay);
-     if (tmo && tmo_delay == 0)
-       cupsdRunTimeout (tmo);
-+
-+   /*
-+    * Try to restart the Avahi client every 10 seconds if needed...
-+    */
-+
-+    if ((current_time - avahi_client_time) >= 10)
-+    {
-+      avahi_client_time = current_time;
-+      cupsdStartAvahiClient();
-+    }
- #endif /* HAVE_AVAHI */
- 
- #ifndef __APPLE__
-diff -up cups-1.5.2/scheduler/printers.c.avahi-5-services cups-1.5.2/scheduler/printers.c
---- cups-1.5.2/scheduler/printers.c.avahi-5-services	2012-03-14 15:04:17.646305537 +0000
-+++ cups-1.5.2/scheduler/printers.c	2012-03-14 15:08:25.720611819 +0000
-@@ -883,9 +883,9 @@ cupsdDeletePrinter(
-   cupsdClearString(&p->alert);
-   cupsdClearString(&p->alert_description);
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdClearString(&p->pdl);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   cupsArrayDelete(p->filetypes);
- 
-@@ -3787,7 +3787,7 @@ add_printer_formats(cupsd_printer_t *p)
-     attr->values[i].string.text = _cupsStrAlloc(mimetype);
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   {
-     char		pdl[1024];	/* Buffer to build pdl list */
-     mime_filter_t	*filter;	/* MIME filter looping var */
-@@ -3843,7 +3843,7 @@ add_printer_formats(cupsd_printer_t *p)
- 
-     cupsdSetString(&p->pdl, pdl);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-diff -up cups-1.5.2/scheduler/printers.h.avahi-5-services cups-1.5.2/scheduler/printers.h
---- cups-1.5.2/scheduler/printers.h.avahi-5-services	2011-03-18 18:42:46.000000000 +0000
-+++ cups-1.5.2/scheduler/printers.h	2012-03-14 15:08:25.721611820 +0000
-@@ -16,6 +16,9 @@
- #ifdef HAVE_DNSSD
- #  include <dns_sd.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include "avahi.h"
-+#endif /* HAVE_AVAHI */
- #include <cups/pwg-private.h>
- 
- 
-@@ -95,16 +98,23 @@ struct cupsd_printer_s
-   time_t	marker_time;		/* Last time marker attributes were updated */
-   _ppd_cache_t	*pc;			/* PPD cache and mapping data */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   char		*reg_name,		/* Name used for service registration */
--		*pdl,			/* pdl value for TXT record */
--		*ipp_txt,		/* IPP TXT record contents */
-+		*pdl;			/* pdl value for TXT record */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+#ifdef HAVE_DNSSD
-+  char		*ipp_txt,		/* IPP TXT record contents */
- 		*printer_txt;		/* LPD TXT record contents */
-   int		ipp_len,		/* IPP TXT record length */
- 		printer_len;		/* LPD TXT record length */
-   DNSServiceRef	ipp_ref,		/* Reference for _ipp._tcp,_cups */
- 		printer_ref;		/* Reference for _printer._tcp */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiStringList *ipp_txt,		/* IPP TXT record */
-+		*printer_txt;		/* LPD TXT record */
-+  AvahiEntryGroup *avahi_group;		/* Avahi entry group */
-+#endif /* HAVE_AVAHI */
- };
- 
- 
diff --git a/testing/cups/cups-no-export-ssllibs.patch b/testing/cups/cups-no-export-ssllibs.patch
deleted file mode 100644
index 9be3c819b..000000000
--- a/testing/cups/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
- 
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- 
diff --git a/testing/cups/cups-no-gcrypt.patch b/testing/cups/cups-no-gcrypt.patch
deleted file mode 100644
index 42f71d0d4..000000000
--- a/testing/cups/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4
---- cups-1.5.0.orig//config-scripts/cups-ssl.m4	2011-01-11 08:05:58.000000000 +0100
-+++ cups-1.5.0/config-scripts/cups-ssl.m4	2011-08-02 10:44:26.011047900 +0200
-@@ -96,7 +96,6 @@
-     dnl Then look for GNU TLS...
-     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
-     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
--    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
- 	if $PKGCONFIG --exists gnutls; then
- 	    have_ssl=1
- 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -110,16 +109,6 @@
- 	    AC_DEFINE(HAVE_SSL)
- 	    AC_DEFINE(HAVE_GNUTLS)
- 	fi
--
--	if test $have_ssl = 1; then
--            if $PKGCONFIG --exists gcrypt; then
--	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
--	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
--	    elif test "x$LIBGCRYPTCONFIG" != x; then
--	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
--	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
--	    fi
--	fi
-     fi
- 
-     dnl Check for the OpenSSL library last...
---- cups-1.5.0.orig//cups/http-private.h	2011-01-22 01:07:22.000000000 +0100
-+++ cups-1.5.0/cups/http-private.h	2011-08-02 10:42:43.341604107 +0200
-@@ -93,7 +93,6 @@
- #  elif defined HAVE_GNUTLS
- #    include <gnutls/gnutls.h>
- #    include <gnutls/x509.h>
--#    include <gcrypt.h>
- #  elif defined(HAVE_CDSASSL)
- #    include <CoreFoundation/CoreFoundation.h>
- #    include <Security/Security.h>
diff --git a/testing/cups/cups-no-gzip-man.patch b/testing/cups/cups-no-gzip-man.patch
deleted file mode 100644
index 69899b9cb..000000000
--- a/testing/cups/cups-no-gzip-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
---- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man	2011-05-12 07:21:56.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-manpages.m4	2011-05-23 17:25:50.000000000 +0200
-@@ -69,10 +69,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and OS X
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/testing/cups/cups-no-gzip-man.patch.16 b/testing/cups/cups-no-gzip-man.patch.16
deleted file mode 100644
index 69899b9cb..000000000
--- a/testing/cups/cups-no-gzip-man.patch.16
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
---- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man	2011-05-12 07:21:56.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-manpages.m4	2011-05-23 17:25:50.000000000 +0200
-@@ -69,10 +69,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and OS X
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/testing/cups/cups-systemd-socket.patch b/testing/cups/cups-systemd-socket.patch
deleted file mode 100644
index 83fabdb4f..000000000
--- a/testing/cups/cups-systemd-socket.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
---- cups-1.6b1/config.h.in.systemd-socket	2012-05-17 00:57:03.000000000 +0200
-+++ cups-1.6b1/config.h.in	2012-05-28 11:16:35.657250584 +0200
-@@ -506,6 +506,13 @@
- 
- 
- /*
-+ * Do we have systemd support?
-+ */
-+
-+#undef HAVE_SYSTEMD
-+
-+
-+/*
-  * Various scripting languages...
-  */
- 
-diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4
---- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket	2012-05-28 11:16:35.658250577 +0200
-+++ cups-1.6b1/config-scripts/cups-systemd.m4	2012-05-28 11:16:35.658250577 +0200
-@@ -0,0 +1,36 @@
-+dnl
-+dnl "$Id$"
-+dnl
-+dnl   systemd stuff for CUPS.
-+
-+dnl Find whether systemd is available
-+
-+SDLIBS=""
-+AC_ARG_WITH([systemdsystemunitdir],
-+        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-+        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
-+if test "x$with_systemdsystemunitdir" != xno; then
-+        AC_MSG_CHECKING(for libsystemd-daemon)
-+        if $PKGCONFIG --exists libsystemd-daemon; then
-+		AC_MSG_RESULT(yes)
-+        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-+        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
-+		AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-+		AC_DEFINE(HAVE_SYSTEMD)
-+	else
-+		AC_MSG_RESULT(no)
-+	fi
-+fi
-+
-+if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
-+        SYSTEMD_UNITS="cups.service cups.socket cups.path"
-+else
-+        SYSTEMD_UNITS=""
-+fi
-+
-+AC_SUBST(SYSTEMD_UNITS)
-+AC_SUBST(SDLIBS)
-+
-+dnl
-+dnl "$Id$"
-+dnl
-diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
---- cups-1.6b1/configure.in.systemd-socket	2012-04-23 19:26:57.000000000 +0200
-+++ cups-1.6b1/configure.in	2012-05-28 11:16:35.658250577 +0200
-@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
- sinclude(config-scripts/cups-largefile.m4)
- sinclude(config-scripts/cups-dnssd.m4)
- sinclude(config-scripts/cups-launchd.m4)
-+sinclude(config-scripts/cups-systemd.m4)
- sinclude(config-scripts/cups-defaults.m4)
- sinclude(config-scripts/cups-scripting.m4)
- 
-@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs
- 	  conf/snmp.conf
- 	  cups-config
- 	  data/testprint
-+          data/cups.service
-+          data/cups.socket
-+          data/cups.path
- 	  desktop/cups.desktop
- 	  doc/help/ref-cupsd-conf.html
- 	  doc/help/standard.html
-diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
---- cups-1.6b1/cups/usersys.c.systemd-socket	2012-04-23 19:26:57.000000000 +0200
-+++ cups-1.6b1/cups/usersys.c	2012-05-28 11:16:35.659250570 +0200
-@@ -975,7 +975,7 @@ cups_read_client_conf(
-     struct stat	sockinfo;		/* Domain socket information */
- 
-     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
--	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
-       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
-     else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in
---- cups-1.6b1/data/cups.path.in.systemd-socket	2012-05-28 11:16:35.659250570 +0200
-+++ cups-1.6b1/data/cups.path.in	2012-05-28 11:16:35.659250570 +0200
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=CUPS Printer Service Spool
-+
-+[Path]
-+PathExistsGlob=@CUPS_REQUESTS@/d*
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in
---- cups-1.6b1/data/cups.service.in.systemd-socket	2012-05-28 11:16:35.659250570 +0200
-+++ cups-1.6b1/data/cups.service.in	2012-05-28 11:16:35.659250570 +0200
-@@ -0,0 +1,10 @@
-+[Unit]
-+Description=CUPS Printing Service
-+
-+[Service]
-+ExecStart=@sbindir@/cupsd -f
-+PrivateTmp=true
-+
-+[Install]
-+Also=cups.socket cups.path
-+WantedBy=printer.target
-diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in
---- cups-1.6b1/data/cups.socket.in.systemd-socket	2012-05-28 11:16:35.660250563 +0200
-+++ cups-1.6b1/data/cups.socket.in	2012-05-28 11:16:35.660250563 +0200
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=CUPS Printing Service Sockets
-+
-+[Socket]
-+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+
-+[Install]
-+WantedBy=sockets.target
-diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
---- cups-1.6b1/data/Makefile.systemd-socket	2011-08-27 11:23:01.000000000 +0200
-+++ cups-1.6b1/data/Makefile	2012-05-28 11:16:35.660250563 +0200
-@@ -100,6 +100,12 @@ install-data:
- 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
- 	done
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
-+	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
-+		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
-+		for file in $(SYSTEMD_UNITS); do \
-+			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
-+		done; \
-+	fi
- 
- 
- #
-@@ -143,6 +149,9 @@ uninstall:
- 	-$(RMDIR) $(DATADIR)/data
- 	-$(RMDIR) $(DATADIR)/banners
- 	-$(RMDIR) $(DATADIR)
-+	for file in $(SYSTEMD_UNITS); do \
-+		$(RM) $(SYSTEMDUNITDIR)/$$file; \
-+	done
- 
- 
- #
-diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
---- cups-1.6b1/Makedefs.in.systemd-socket	2012-05-28 11:16:35.648250647 +0200
-+++ cups-1.6b1/Makedefs.in	2012-05-28 11:16:35.660250563 +0200
-@@ -134,11 +134,13 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
- CXXLIBS		=	@CXXLIBS@
- DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
- DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
-+SYSTEMD_UNITS   =       @SYSTEMD_UNITS@
- DNSSD_BACKEND	=	@DNSSD_BACKEND@
- DSOFLAGS	=	-L../cups @DSOFLAGS@
- DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
- DNSSDLIBS	=	@DNSSDLIBS@
- LAUNCHDLIBS	=	@LAUNCHDLIBS@
-+SDLIBS		=	@SDLIBS@
- LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
- 			-L../scheduler @LDARCHFLAGS@ \
- 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -229,6 +231,7 @@ PAMFILE		=	@PAMFILE@
- 
- DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
- DBUSDIR		=	@DBUSDIR@
-+SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
- 
- 
- #
-diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h
---- cups-1.6b1/scheduler/client.h.systemd-socket	2012-03-22 21:30:20.000000000 +0100
-+++ cups-1.6b1/scheduler/client.h	2012-05-28 11:16:35.661250556 +0200
-@@ -77,6 +77,9 @@ typedef struct
-   int			fd;		/* File descriptor for this server */
-   http_addr_t		address;	/* Bind address of socket */
-   http_encryption_t	encryption;	/* To encrypt or not to encrypt... */
-+#ifdef HAVE_SYSTEMD
-+  int			is_systemd;	/* Is this a systemd socket? */
-+#endif /* HAVE_SYSTEMD */
- } cupsd_listener_t;
- 
- 
-diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c
---- cups-1.6b1/scheduler/listen.c.systemd-socket	2011-04-16 01:38:13.000000000 +0200
-+++ cups-1.6b1/scheduler/listen.c	2012-05-28 11:16:35.661250556 +0200
-@@ -401,7 +401,11 @@ cupsdStopListening(void)
-        lis;
-        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-   {
--    if (lis->fd != -1)
-+    if (lis->fd != -1
-+#ifdef HAVE_SYSTEMD
-+        && !lis->is_systemd
-+#endif /* HAVE_SYSTEMD */
-+        )
-     {
- #ifdef WIN32
-       closesocket(lis->fd);
-diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
---- cups-1.6b1/scheduler/main.c.systemd-socket	2012-05-28 11:16:35.612250897 +0200
-+++ cups-1.6b1/scheduler/main.c	2012-05-28 12:49:32.698375139 +0200
-@@ -26,6 +26,8 @@
-  *   launchd_checkin()     - Check-in with launchd and collect the listening
-  *                           fds.
-  *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
-+ *   systemd_checkin()     - Check-in with systemd and collect the
-+ *                           listening fds.
-  *   parent_handler()      - Catch USR1/CHLD signals...
-  *   process_children()    - Process all dead children...
-  *   select_timeout()      - Calculate the select timeout value.
-@@ -62,6 +64,10 @@
- #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
-+#endif /* HAVE_SYSTEMD */
-+
- #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
- #  include <malloc.h>
- #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -78,6 +84,9 @@
- static void		launchd_checkin(void);
- static void		launchd_checkout(void);
- #endif /* HAVE_LAUNCHD */
-+#ifdef HAVE_SYSTEMD
-+static void		systemd_checkin(void);
-+#endif /* HAVE_SYSTEMD */
- static void		parent_handler(int sig);
- static void		process_children(void);
- static void		sigchld_handler(int sig);
-@@ -528,6 +537,13 @@ main(int  argc,				/* I - Number of comm
-   }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+ /*
-+  * If we were started by systemd get the listen sockets file descriptors...
-+  */
-+  systemd_checkin();
-+#endif /* HAVE_SYSTEMD */
-+
-  /*
-   * Startup the server...
-   */
-@@ -738,6 +754,15 @@ main(int  argc,				/* I - Number of comm
- 	}
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+       /*
-+	* If we were started by systemd get the listen sockets file
-+	* descriptors...
-+        */
-+
-+        systemd_checkin();
-+#endif /* HAVE_SYSTEMD */
-+
-        /*
-         * Startup the server...
-         */
-@@ -1516,6 +1541,102 @@ launchd_checkout(void)
- }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+static void
-+systemd_checkin(void)
-+{
-+  int n, fd;
-+
-+  n = sd_listen_fds(0);
-+  if (n < 0)
-+  {
-+    cupsdLogMessage(CUPSD_LOG_ERROR,
-+           "systemd_checkin: Failed to acquire sockets from systemd - %s",
-+           strerror(-n));
-+    exit(EXIT_FAILURE);
-+    return;
-+  }
-+
-+  if (n == 0)
-+    return;
-+
-+  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
-+  {
-+    http_addr_t addr;
-+    socklen_t addrlen = sizeof (addr);
-+    int r;
-+    cupsd_listener_t *lis;
-+    char s[256];
-+
-+    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
-+    if (r < 0)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to verify socket type - %s",
-+             strerror(-r));
-+      continue;
-+    }
-+
-+    if (!r)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Socket not of the right type");
-+      continue;
-+    }
-+
-+    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to get local address - %s",
-+             strerror(errno));
-+      continue;
-+    }
-+
-+   /*
-+    * Try to match the systemd socket address to one of the listeners...
-+    */
-+
-+    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
-+       lis;
-+       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-+      if (httpAddrEqual(&lis->address, &addr))
-+	break;
-+
-+    if (lis)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Matched existing listener %s with fd %d...",
-+                      httpAddrString(&(lis->address), s, sizeof(s)), fd);
-+    }
-+    else
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Adding new listener %s with fd %d...",
-+                      httpAddrString(&addr, s, sizeof(s)), fd);
-+
-+      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR,
-+                        "systemd_checkin: Unable to allocate listener - "
-+                        "%s.", strerror(errno));
-+        exit(EXIT_FAILURE);
-+      }
-+
-+      cupsArrayAdd(Listeners, lis);
-+
-+      memcpy(&lis->address, &addr, sizeof(lis->address));
-+    }
-+
-+    lis->fd = fd;
-+    lis->is_systemd = 1;
-+
-+#  ifdef HAVE_SSL
-+    if (_httpAddrPort(&(lis->address)) == 443)
-+      lis->encryption = HTTP_ENCRYPT_ALWAYS;
-+#  endif /* HAVE_SSL */
-+  }
-+}
-+#endif /* HAVE_SYSTEMD */
- 
- /*
-  * 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile
---- cups-1.6b1/scheduler/Makefile.systemd-socket	2012-05-21 19:40:22.000000000 +0200
-+++ cups-1.6b1/scheduler/Makefile	2012-05-28 11:16:35.663250542 +0200
-@@ -371,7 +371,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
- 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
--		$(LIBGSSAPI) $(LIBWRAP)
-+		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
- 
- cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
- 	echo Linking $@...
-@@ -379,7 +379,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
- 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
--		$(LIBWRAP)
-+		$(LIBWRAP)  $(SDLIBS)
- 
- tls.o:	tls-darwin.c tls-gnutls.c tls-openssl.c
- 
diff --git a/testing/cups/cups.install b/testing/cups/cups.install
deleted file mode 100644
index fc015f951..000000000
--- a/testing/cups/cups.install
+++ /dev/null
@@ -1,38 +0,0 @@
-post_install() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
- echo ">> If you use an HTTPS connection to CUPS, the first time you access"
- echo ">> the interface it may take a very long time before the site comes up."
- echo ">> This is because the first request triggers the generation of the CUPS"
- echo ">> SSL certificates which can be a very time-consuming job."
-}
-
-post_upgrade() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
-  if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
-    # important upgrade notice
-    echo "daemon script has been renamed to /etc/rc.d/cupsd"
-    echo "change your entry in  /etc/rc.conf"
-  fi
-  if [ "`vercmp $2 1.6.0`" -lt 0 ]; then
-    # important upgrade notice
-    echo "* avahi-daemon should now run before you start cupsd for"
-    echo "  printer Browsing support"
-    echo "* check your config with cupsd -t"
-    echo "  and fix all Browsing related settings"
-  fi
-    if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
-    # important upgrade notice
-    echo "> It's now safe to load usblp kernel module."
-    echo "> There's no more need to blacklist it."
-  fi
-}
-
-post_remove() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
-}
diff --git a/testing/cups/cups.logrotate b/testing/cups/cups.logrotate
deleted file mode 100644
index 9c49bbdaf..000000000
--- a/testing/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cups/*log {
-   missingok
-   notifempty
-   delaycompress
-   postrotate
-      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/testing/cups/cups.pam b/testing/cups/cups.pam
deleted file mode 100644
index 53724d1f8..000000000
--- a/testing/cups/cups.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/cups/cupsd-conf-remove-obsolete-browse-directives.patch b/testing/cups/cupsd-conf-remove-obsolete-browse-directives.patch
deleted file mode 100644
index 97636c7f2..000000000
--- a/testing/cups/cupsd-conf-remove-obsolete-browse-directives.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uraN cups/conf/cupsd.conf.in cups-new/conf/cupsd.conf.in
---- cups/conf/cupsd.conf.in	2012-05-25 15:28:25.000000000 +0200
-+++ cups-new/conf/cupsd.conf.in	2012-08-04 20:56:26.699062177 +0200
-@@ -19,8 +19,6 @@
- 
- # Show shared printers on the local network.
- Browsing On
--BrowseOrder allow,deny
--BrowseAllow all
- BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
- 
- # Default authentication type, when authentication is required...
diff --git a/testing/cups/recognize-remote-cups-queue-via-dnssd-uri.patch b/testing/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
deleted file mode 100644
index 6349bd901..000000000
--- a/testing/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uraN cups/scheduler/printers.c cups-new/scheduler/printers.c
---- cups/scheduler/printers.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/printers.c	2012-08-04 20:58:40.475725544 +0200
-@@ -4829,13 +4829,14 @@
- 		   "printer-make-and-model", NULL,
- 		   "Local System V Printer");
-     }
--    else if (!strncmp(p->device_uri, "ipp://", 6) &&
--	     (strstr(p->device_uri, "/printers/") != NULL ||
--	      strstr(p->device_uri, "/classes/") != NULL ||
--	      ((strstr(p->device_uri, "._ipp.") != NULL ||
--	        strstr(p->device_uri, "._ipps.") != NULL) &&
--	       !strcmp(p->device_uri + strlen(p->device_uri) - 5,
--		       "/cups"))))
-+    else if ((!strncmp(p->device_uri, "ipp://", 6) &&
-+	      (strstr(p->device_uri, "/printers/") != NULL ||
-+	       strstr(p->device_uri, "/classes/") != NULL)) ||
-+	     (!strncmp(p->device_uri, "dnssd://", 8) &&
-+	      (strstr(p->device_uri, "._ipp.") != NULL ||
-+	       strstr(p->device_uri, "._ipps.") != NULL) &&
-+	      !strcmp(p->device_uri + strlen(p->device_uri) - 5,
-+		      "/cups")))
-     {
-      /*
-       * Tell the client this is really a hard-wired remote printer.
diff --git a/testing/cups/usb-backend-reset-after-job-only-for-specific-devices.patch b/testing/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
deleted file mode 100644
index dcf91c833..000000000
--- a/testing/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- backend/usb-libusb.c.orig	2012-07-16 19:10:55.000000000 +0200
-+++ backend/usb-libusb.c	2012-08-06 11:01:58.034150159 +0200
-@@ -70,7 +70,7 @@
- 			read_endp,	/* Read endpoint */
- 			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
- 			usblp_attached,	/* "usblp" kernel module attached? */
--			opened_for_job;	/* Set to 1 by print_device() */
-+			reset_after_job; /* Set to 1 by print_device() */
-   unsigned int		quirks;		/* Quirks flags */
-   struct libusb_device_handle *handle;	/* Open handle to device */
- } usb_printer_t;
-@@ -122,6 +122,8 @@
- #define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
- #define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
- 					   Class or SubClass */
-+#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
-+					   for clean-up */
- #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
- 					   the usblp kernel module */
- 
-@@ -147,9 +149,11 @@
- 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
- 						      Printer M129C */
- 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
--			  USBLP_QUIRK_NO_REATTACH },
-+			  USBLP_QUIRK_NO_REATTACH |
-+	                  USBLP_QUIRK_RESET },
- 	/* Prolific Technology, Inc. PL2305 Parallel Port
- 	   (USB -> Parallel adapter) */
-+	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */
- 	{ 0, 0 }
- };
- 
-@@ -256,7 +260,12 @@
-   }
- 
-   g.print_fd = print_fd;
--  g.printer->opened_for_job = 1;
-+
-+ /*
-+  * Some devices need a reset after finishing a job, these devices are
-+  * marked with the USBLP_QUIRK_RESET quirk.
-+  */
-+  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
- 
-  /*
-   * If we are printing data from a print driver on stdin, ignore SIGTERM
-@@ -772,7 +781,7 @@
-     * Reset the device to clean up after the job
-     */
- 
--    if (printer->opened_for_job == 1)
-+    if (printer->reset_after_job == 1)
-     {
-       if ((errcode = libusb_reset_device(printer->handle)) < 0)
- 	fprintf(stderr,
-@@ -1288,7 +1297,7 @@
-   }
- 
-   printer->usblp_attached = 0;
--  printer->opened_for_job = 0;
-+  printer->reset_after_job = 0;
- 
-   if (verbose)
-     fputs("STATE: +connecting-to-device\n", stderr);
-@@ -1586,7 +1595,7 @@
-   for (i = 0; quirk_printers[i].vendorId; i++)
-   {
-     if (vendor == quirk_printers[i].vendorId &&
--	product == quirk_printers[i].productId)
-+	(product == 0x0000 || product == quirk_printers[i].productId))
-       return quirk_printers[i].quirks;
-   }
-   return 0;
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index 8b6373338..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 168414 2012-10-11 14:27:49Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=curl
-pkgver=7.28.0
-pkgrel=1
-pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        curlbuild.h)
-md5sums=('cbdc0a79bdf6e657dd387c3d88d802e3'
-         '7359e07276cdaff6317bbc39e6d5899c'
-         '751bd433ede935c8fae727377625a8ae')
-
-ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
-case $ptrsize in
-  8) _curlbuild=curlbuild-64.h ;;
-  4) _curlbuild=curlbuild-32.h ;;
-  *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
-    exit 1
-    ;;
-esac
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-      --prefix=/usr \
-      --mandir=/usr/share/man \
-      --disable-dependency-tracking \
-      --disable-ldap \
-      --disable-ldaps \
-      --enable-ipv6 \
-      --enable-manual \
-      --enable-versioned-symbols \
-      --enable-threaded-resolver \
-      --without-libidn \
-      --with-random=/dev/urandom \
-      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  # devel
-  install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
-  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
-  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}
diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h
deleted file mode 100644
index b48862696..000000000
--- a/testing/curl/curlbuild.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/testing/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 b6c2a29bc..000000000
--- a/testing/cyrus-sasl/PKGBUILD
+++ /dev/null
@@ -1,203 +0,0 @@
-# $Id: PKGBUILD 165399 2012-08-17 23:39:59Z heftig $
-# 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=10
-pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
-url="http://cyrusimap.web.cmu.edu/"
-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.service
-        saslauthd.conf.d
-        saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         'e27ddff076342e7a3041c4759817d04b'
-         'd7e6886e88af04d05f3dec7f0a59ccf7'
-         '79b8a5e8689989e2afd4b7bda595a7b1'
-         'f4131b077ddb5240b375d749162f1b7a'
-         'c7ad2c70c1ef814eb4b119f316c064f2'
-         'caeeac3feba19cbbd36e7345cc805600'
-         'f45d8b60e8f74dd7f7c2ec1665fa602a'
-         '9d93880514cb5ff5da969f1ceb64a661'
-         'dfdc052a7e678db9f687482c5d52f34e'
-         '4a09f6b24b91f8450892a78e378860da'
-         '213abe7c5dfe0d7f446992787da1e780'
-         '5a0321177ad30cb5518c8b6812e3961a'
-         '0c965748970eea29fa295524821d43f0'
-         '62bf892fe4d1df41ff748e91a1afaf67'
-         'b7848957357e7c02d6490102be496bf9'
-         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
-         '8e7106f32e495e9ade69014fd1b3352a'
-         '00f6b781549a274630e22173f77bd41d'
-         '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}")
-  pkgdesc="Cyrus saslauthd SASL authentication daemon"
-  backup=('etc/conf.d/saslauthd')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
-  make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
-  install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
-  install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
-
-  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}" '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}" '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}" '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/cyrus-sasl/saslauthd.service b/testing/cyrus-sasl/saslauthd.service
deleted file mode 100644
index 42d8ad768..000000000
--- a/testing/cyrus-sasl/saslauthd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Cyrus SASL authentication daemon
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/saslauthd
-ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS
-PidFile=/var/run/saslauthd/saslauthd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD
deleted file mode 100644
index d5486fe00..000000000
--- a/testing/dbus-core/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 167237 2012-09-29 08:09:25Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus-core
-pkgver=1.6.8
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
-makedepends=('libx11')
-options=(!libtool)
-install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
-        dbus)
-md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
-         'f0364f3f5dc5f653bb05d39aa36e3264')
-
-build() {
-  cd dbus-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/run/dbus/pid \
-      --with-system-socket=/run/dbus/system_bus_socket \
-      --with-console-auth-dir=/run/console/ \
-      --enable-inotify --disable-dnotify \
-      --disable-verbose-mode --disable-static \
-      --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --enable-systemd
-  make
-}
-
-package(){
-  cd dbus-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir/usr/bin/dbus-launch"
-  rm -f "$pkgdir/usr/share/man/man1/dbus-launch.1"
-  rm -rf "$pkgdir/var/run"
-
-  install -m755 -d "$pkgdir/etc/rc.d"
-  install -m755 ../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 -dm755 "$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 bf532a274..000000000
--- a/testing/dbus-core/dbus
+++ /dev/null
@@ -1,51 +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 [[ ! -d /run/dbus ]] ; then
-            install -m755 -g 81 -o 81 -d /run/dbus
-        fi
-
-        if ! dbus-daemon --system; then
-            stat_fail
-        else
-            add_daemon dbus
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping D-BUS system messagebus"
-        if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
-            stat_fail
-        else
-            rm -f /run/dbus/pid
-            rm_daemon dbus
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-    reload)
-        stat_busy "Reloading D-BUS configuration"
-        if ! { [[ -f /run/dbus/pid ]] && dbus-send \
-                --system --type=method_call \
-                --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig; }; 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 f1ffd61a8..000000000
--- a/testing/dbus-core/dbus.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-  getent group dbus >/dev/null || groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
-  passwd -l dbus &>/dev/null
-}
-
-post_upgrade() {
-  post_install
-
-  # Make sure new rc script can shutdown running dbus
-  if [ -f run/dbus.pid -a -d run/dbus ]; then
-    mv run/dbus.pid run/dbus/pid
-  fi
-}
-
-post_remove() {
-  if getent passwd dbus >/dev/null; then
-    userdel dbus
-  fi
-  if getent group dbus >/dev/null; then
-    groupdel dbus
-  fi
-}
diff --git a/testing/dbus-python/PKGBUILD b/testing/dbus-python/PKGBUILD
deleted file mode 100644
index 69caec8f6..000000000
--- a/testing/dbus-python/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 168835 2012-10-16 11:53:35Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=dbus-python
-pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="Python bindings for DBUS"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-makedepends=('docutils' 'dbus-glib' 'python' 'python2')
-options=('!libtool')
-source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('742c7432ad0f7c3f98291d58fa2e35dc')
-
-build() {
-  cd "${srcdir}"
-  mkdir build-python2 build-python3
-  cd "${srcdir}/build-python2"
-  PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  make
-
-
-  cd "${srcdir}/build-python3"
-  ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  make
-}
-
-package_python-dbus-common() {
-  pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus"
-  conflicts=('dbus-python<1.1.0')
-
-  cd "${srcdir}/build-python3"
-  make DESTDIR="${pkgdir}" install-data
-  rm -rf "${pkgdir}"/usr/lib/python*
-}
-
-package_python-dbus() {
-  depends=('python-dbus-common' 'python' 'dbus-core')
-  optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 3.3 bindings for DBUS"
-
-  cd "${srcdir}/build-python3"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-}
-
-package_python2-dbus() {
-  depends=('python-dbus-common' 'python2' 'dbus-core')
-  optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 2.7 bindings for DBUS"
-  replaces=('dbus-python')
-  conflicts=('dbus-python')
-  provides=("dbus-python=$pkgver")
-
-  cd "${srcdir}/build-python2"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-}
diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus
deleted file mode 100644
index 69d2660da..000000000
--- a/testing/dbus/30-dbus
+++ /dev/null
@@ -1,8 +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 5f2fbf835..000000000
--- a/testing/dbus/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 167239 2012-09-29 08:11:40Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus
-pkgver=1.6.8
-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 #{,.asc}
-        30-dbus)
-md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
-         '9fafe8b28460aeaa6054309ef4c5ed92')
-
-build() {
-  cd $pkgname-$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 \
-      --disable-verbose-mode --disable-static \
-      --enable-inotify --disable-dnotify \
-      --disable-tests --disable-asserts
-  make -C tools dbus-launch
-}
-
-package() {
-  cd $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 ../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 0bf1ed1c7..000000000
--- a/testing/dconf/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169264 2012-10-18 19:29:07Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=dconf
-pkgver=0.14.0
-pkgrel=1
-pkgdesc="A low-level configuration system."
-arch=(i686 x86_64)
-url="http://live.gnome.org/dconf"
-license=('LGPL2.1')
-depends=('glib2' 'gtk-update-icon-cache')
-makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl')
-optdepends=('gtk3: for dconf-editor')
-install=dconf.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9ae848bf25c3de0fb8c0157679630ddf39be1c10ed2f3beb2b8f0165d768da33')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/dconf
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make completiondir=/usr/share/bash-completion/completions 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 75d713d64..000000000
--- a/testing/dconf/dconf.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    gio-querymodules /usr/lib/gio/modules
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade(){
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/ddrescue/PKGBUILD b/testing/ddrescue/PKGBUILD
deleted file mode 100644
index 13824ccab..000000000
--- a/testing/ddrescue/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 163956 2012-07-22 18:33:26Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ddrescue
-pkgver=1.16
-pkgrel=2
-pkgdesc="GNU data recovery tool"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/ddrescue/ddrescue.html"
-license=('GPL3')
-depends=('gcc-libs')
-install=$pkgname.install
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-        "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig")
-md5sums=('57b67407e882c6418531d48a2f20d16b'
-         'bf072280587665d82829be15eb6fc9ad')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  rm "$pkgdir"/usr/share/info/dir
-}
diff --git a/testing/ddrescue/ddrescue.install b/testing/ddrescue/ddrescue.install
deleted file mode 100644
index 9e2afa74e..000000000
--- a/testing/ddrescue/ddrescue.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(ddrescue.info)
-
-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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/devhelp/PKGBUILD b/testing/devhelp/PKGBUILD
deleted file mode 100644
index d5b880feb..000000000
--- a/testing/devhelp/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169263 2012-10-18 19:29:04Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=devhelp
-pkgver=3.6.0
-pkgrel=2
-pkgdesc="API documentation browser for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'webkitgtk3' '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=('bf0576d5d70496367ccb22be53be620bbfe341bd491c1d725cfb59d566769fe1')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-webkit2
-  make
-}
-
-package() {
-  cd $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 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/dhcp/PKGBUILD b/testing/dhcp/PKGBUILD
deleted file mode 100644
index 31ace7328..000000000
--- a/testing/dhcp/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id: PKGBUILD 165396 2012-08-17 23:27:19Z heftig $
-# Maintainer: Daniel Isenmann <daniel @archlinux.org>
-
-pkgbase=dhcp
-pkgname=('dhcp' 'dhclient')
-
-# separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.1
-_pkgver=4.2.4-P1
-
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('custom:isc-dhcp')
-url="https://www.isc.org/software/dhcp"
-makedepends=('bash' 'iproute2' 'net-tools')
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
-        dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
-        dhcp-4.1.1-missing-ipv6-not-fatal.patch
-        dhclient-script-pathFixes.patch)
-md5sums=('0ca7181024651f6323951d5498c8020b'
-         '0dfe000dd88555ea06b282ae5e574d5f'
-         'c49b1497837ba56c54e401a66e1bab9b'
-         '12c2f3ae47ed23eb698eb7f1bfd80f20'
-         '8f357e46e1efcbb746f38737a3f977a2'
-         '1076444f22e13eb5f6bff7821fd0f446'
-         '9310f2d8b1d7e97ace06d68cb41d9998'
-         'fd64aeb4f399dcc41ea43089a3811094'
-         '541b415a25a169eaf64b681405f79a80')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
-
-  # Define _GNU_SOURCE to fix IPV6.
-  sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
-
-  # Make not having ipv6 non-fatal.
-  patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-      --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
-      --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
-      --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
-
-  make
-
-  patch -i "${srcdir}/dhclient-script-pathFixes.patch" client/scripts/linux
-}
-
-package_dhcp(){
-  pkgdesc="A DHCP server, client, and relay agent"
-  depends=('openssl>=0.9.8a')
-  backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
-  install=dhcp.install
-  
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
-  install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
-  install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
-  install -d "${pkgdir}/var/state/dhcp"
-
-  install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
-  install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service"
-  ln -s dhcpd4.service "${pkgdir}/usr/lib/systemd/system/dhcp4.service"
-  ln -s dhcpd6.service "${pkgdir}/usr/lib/systemd/system/dhcp6.service"
-
-  # Remove dhclient
-  make -C client DESTDIR="${pkgdir}" uninstall
-  
-  # install license
-  install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE"
-}
-
-package_dhclient(){
-  pkgdesc="A standalone DHCP client from the dhcp package"
-  depends=('bash' 'iproute2' 'net-tools')
-
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
-  make -C client DESTDIR="${pkgdir}" install
-
-  # move dhclient.conf to dhclient.conf.example
-  mv "${pkgdir}"/etc/dhclient.conf{,.example}
-  
-  install -d "${pkgdir}/var/state/dhclient"
-
-  # install dhclient linux script
-  install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"
-
-  # install license
-  install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE"
-}
diff --git a/testing/dhcp/dhclient-script-pathFixes.patch b/testing/dhcp/dhclient-script-pathFixes.patch
deleted file mode 100644
index a4143ddde..000000000
--- a/testing/dhcp/dhclient-script-pathFixes.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- linux	2011-05-18 20:01:54.000000000 +0000
-+++ linux_new	2011-12-21 18:45:41.487171012 +0000
-@@ -23,7 +23,7 @@
- # of the $1 in its args.
- 
- # 'ip' just looks too weird.  /sbin/ip looks less weird.
--ip=/sbin/ip
-+ip=/usr/sbin/ip
- 
- make_resolv_conf() {
-   if [ x"$new_domain_name_servers" != x ]; then
-@@ -122,9 +122,9 @@
- if [ x$reason = xPREINIT ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Bring down alias interface. Its routes will disappear too.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
--  ifconfig $interface 0 up
-+  /sbin/ifconfig $interface 0 up
- 
-   # We need to give the kernel some time to get the interface up.
-   sleep 1
-@@ -151,25 +151,25 @@
-   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
- 		[ x$alias_ip_address != x$old_ip_address ]; then
-     # Possible new alias. Remove old alias.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
-   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
-     # IP address changed. Bringing down the interface will delete all routes,
-     # and clear the ARP cache.
--    ifconfig $interface inet 0 down
-+    /sbin/ifconfig $interface inet 0 down
- 
-   fi
-   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
- 
--    ifconfig $interface inet $new_ip_address $new_subnet_arg \
-+    /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg $mtu_arg
-     # Add a network route to the computed network address.
-     for router in $new_routers; do
-       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	route add -host $router dev $interface
-+	/sbin/route add -host $router dev $interface
-       fi
--      route add default gw $router $metric_arg dev $interface
-+      /sbin/route add default gw $router $metric_arg dev $interface
-     done
-   else
-     # we haven't changed the address, have we changed other options           
-@@ -177,21 +177,21 @@
-     if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
-       # if we've changed routers delete the old and add the new.
-       for router in $old_routers; do
--        route del default gw $router
-+        /sbin/route del default gw $router
-       done
-       for router in $new_routers; do
-         if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	  route add -host $router dev $interface
-+	  /sbin/route add -host $router dev $interface
- 	fi
--	route add default gw $router $metric_arg dev $interface
-+	/sbin/route add default gw $router $metric_arg dev $interface
-       done
-     fi
-   fi
-   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
-    then
--    ifconfig $interface:0- inet 0
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    /sbin/ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+    /sbin/route add -host $alias_ip_address $interface:0
-   fi
-   make_resolv_conf
-   exit_with_hooks 0
-@@ -201,42 +201,42 @@
-    || [ x$reason = xSTOP ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Turn off alias interface.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
-   if [ x$old_ip_address != x ]; then
-     # Shut down interface, which will delete routes and clear arp cache.
--    ifconfig $interface inet 0 down
-+    /sbin/ifconfig $interface inet 0 down
-   fi
-   if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+    /sbin/route add -host $alias_ip_address $interface:0
-   fi
-   exit_with_hooks 0
- fi
- 
- if [ x$reason = xTIMEOUT ]; then
-   if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
--  ifconfig $interface inet $new_ip_address $new_subnet_arg \
-+  /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg $mtu_arg
-   set $new_routers
-   if ping -q -c 1 $1; then
-     if [ x$new_ip_address != x$alias_ip_address ] && \
- 			[ x$alias_ip_address != x ]; then
--      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--      route add -host $alias_ip_address dev $interface:0
-+      /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+      /sbin/route add -host $alias_ip_address dev $interface:0
-     fi
-     for router in $new_routers; do
-       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	route add -host $router dev $interface
-+	/sbin/route add -host $router dev $interface
-       fi
--      route add default gw $router $metric_arg dev $interface
-+      /sbin/route add default gw $router $metric_arg dev $interface
-     done
-     make_resolv_conf
-     exit_with_hooks 0
-   fi
--  ifconfig $interface inet 0 down
-+  /sbin/ifconfig $interface inet 0 down
-   exit_with_hooks 1
- fi
- 
diff --git a/testing/dhcp/dhcp b/testing/dhcp/dhcp
deleted file mode 100644
index d4f228d9c..000000000
--- a/testing/dhcp/dhcp
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-# ipv4 runtime parameters
-DHCP4_ARGS="-q"
-
-# ipv6 runtime parameters
-DHCP6_ARGS="-q"
-
diff --git a/testing/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch b/testing/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch
deleted file mode 100644
index cc5ddb843..000000000
--- a/testing/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- common/discover.c	2009-09-29 21:44:49.000000000 +0200
-+++ common/discover.c_new	2010-06-30 19:40:02.000000000 +0200
-@@ -443,7 +443,7 @@
- 	}
- 
- #ifdef DHCPv6
--	if (local_family == AF_INET6) {
-+	if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
- 		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
- 		if (ifaces->fp6 == NULL) {
- 			log_error("Error opening '/proc/net/if_inet6' to "
-@@ -454,6 +454,8 @@
- 			ifaces->fp = NULL;
- 			return 0;
- 		}
-+	} else {
-+		ifaces->fp6 = NULL;
- 	}
- #endif
- 
-@@ -721,7 +723,7 @@
- 		return 1;
- 	}
- #ifdef DHCPv6
--	if (!(*err)) {
-+	if (!(*err) && ifaces->fp6) {
- 		if (local_family == AF_INET6)
- 			return next_iface6(info, err, ifaces);
- 	}
-@@ -740,7 +742,8 @@
- 	ifaces->sock = -1;
- #ifdef DHCPv6
- 	if (local_family == AF_INET6) {
--		fclose(ifaces->fp6);
-+		if(ifaces->fp6)
-+			fclose(ifaces->fp6);
- 		ifaces->fp6 = NULL;
- 	}
- #endif
diff --git a/testing/dhcp/dhcp.conf.d b/testing/dhcp/dhcp.conf.d
deleted file mode 100644
index 99ba6d13d..000000000
--- a/testing/dhcp/dhcp.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-DHCP_ARGS="-q"
-
diff --git a/testing/dhcp/dhcp.install b/testing/dhcp/dhcp.install
deleted file mode 100644
index 5302be4b5..000000000
--- a/testing/dhcp/dhcp.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
-  [ -f var/state/dhcp/dhcpd6.leases ] || : >var/state/dhcp/dhcpd6.leases
-  #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded."
-
-  echo
-  echo "==> The dhcp server has now two rc.d scripts."
-  echo "==> Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or"
-  echo "==> '/etc/rc.d/dhcp4' to use IPv4 dhcp server."
-  echo "==> Make sure that you change your DAEMONS array in '/etc/rc.conf'!"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/testing/dhcp/dhcp4 b/testing/dhcp/dhcp4
deleted file mode 100644
index 8e1277a37..000000000
--- a/testing/dhcp/dhcp4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcpd.pid"
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID < "$PIDFILE"
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-    echo 'pid not found. deleteing stale pidfile'
-    unset PID
-    rm -f "$PIDFILE"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting DHCPv4 Server"
-    if [[ $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if /usr/sbin/dhcpd -4 -pf "$PIDFILE" $DHCP4_ARGS; then
-      add_daemon dhcp4
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCPv4 Server"
-    if [[ ! $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
-      rm_daemon dhcp4
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
diff --git a/testing/dhcp/dhcp6 b/testing/dhcp/dhcp6
deleted file mode 100644
index 6b4b4d359..000000000
--- a/testing/dhcp/dhcp6
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcp6.pid"
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID < "$PIDFILE"
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-    echo 'pid not found. deleteing stale pidfile'
-    unset PID
-    rm -f "$PIDFILE"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting DHCPv6 Server"
-    if [[ $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if /usr/sbin/dhcpd -6 -pf "$PIDFILE" $DHCP6_ARGS; then
-      add_daemon dhcp6
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCPv6 Server"
-    if [[ ! $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
-      rm_daemon dhcp6
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
diff --git a/testing/dhcp/dhcpd b/testing/dhcp/dhcpd
deleted file mode 100755
index 1fbb31e7c..000000000
--- a/testing/dhcp/dhcpd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcpd.pid"
-PID=`cat $PIDFILE 2>/dev/null`
-case "$1" in
-  start)
-    stat_busy "Starting DHCP Server"
-    if [ "$PID" = "" ]; then 
-       /usr/sbin/dhcpd $DHCP_ARGS 
-    fi
-    if [ "$PID" != "" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon dhcpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCP Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    rm -f $PIDFILE
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dhcpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/dhcp/dhcpd4.service b/testing/dhcp/dhcpd4.service
deleted file mode 100644
index 2ef4a9f26..000000000
--- a/testing/dhcp/dhcpd4.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=IPv4 DHCP server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpd4.pid
-ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid
-ExecReload=/bin/kill -TERM $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/dhcp/dhcpd6.service b/testing/dhcp/dhcpd6.service
deleted file mode 100644
index eb3b337c6..000000000
--- a/testing/dhcp/dhcpd6.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=IPv6 DHCP server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpd6.pid
-ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid
-ExecReload=/bin/kill -TERM $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch
deleted file mode 100644
index 4420d0b63..000000000
--- a/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan@archlinux.org>
-Date: Sun, 19 Jun 2011 16:04:25 -0500
-Subject: [PATCH] Set hostname via /proc if file is available
-
-On Linux, the hostname can be set via this file if available, precluding
-the need for a `hostname` binary.
-
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- dhcpcd-hooks/30-hostname |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
-index 65d1a13..af94262 100644
---- a/dhcpcd-hooks/30-hostname
-+++ b/dhcpcd-hooks/30-hostname
-@@ -21,7 +21,11 @@ need_hostname()
- try_hostname()
- {
- 	if valid_domainname "$1"; then
--		hostname "$1"
-+		if [ -w /proc/sys/kernel/hostname ]; then
-+			echo "$1" > /proc/sys/kernel/hostname
-+		else
-+			hostname "$1"
-+		fi
- 	else
- 		syslog err "Invalid hostname: $1"
- 	fi
--- 
-1.7.5.4
-
diff --git a/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch
deleted file mode 100644
index 7e78ecd0d..000000000
--- a/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <d@falconindy.com>
-Date: Tue, 21 Jun 2011 09:32:47 -0400
-Subject: [PATCH] set MTU via sysfs if file is available
-
-On Linux, a network interface's MTU can be set by writing to
-/sys/class/net/$interface/mtu, which removes the dependency on ifconfig.
-
-Signed-off-by: Dave Reisner <d@falconindy.com>
----
- dhcpcd-hooks/10-mtu |    4 ++--
- dhcpcd-run-hooks.in |   11 +++++++++++
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
-index 639697c..8763930 100644
---- a/dhcpcd-hooks/10-mtu
-+++ b/dhcpcd-hooks/10-mtu
-@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
- elif [ -n "$new_interface_mtu" ] && $if_up; then
- 	# The smalled MTU dhcpcd can work with is 576
- 	if [ "$new_interface_mtu" -ge 576 ]; then
--		if ifconfig "$interface" mtu "$new_interface_mtu"; then
-+		if set_mtu "$interface" "$new_interface_mtu"; then
- 			syslog info "$interface: MTU set to $new_interface_mtu"
- 			# Save the MTU so we can restore it later
- 			if [ ! -e "$mtu_dir/$interface" ]; then
-@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then
- 		# No MTU in this state, so restore the prior MTU
- 		mtu=$(cat "$mtu_dir/$interface")
- 		syslog info "$interface: MTU restored to $mtu"
--		ifconfig "$interface" mtu "$mtu"
-+		set_mtu "$interface" "$mtu"
- 		rm "$mtu_dir/$interface"
- 	fi
- fi
-diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
-index 0e60338..843f3ca 100644
---- a/dhcpcd-run-hooks.in
-+++ b/dhcpcd-run-hooks.in
-@@ -215,6 +215,17 @@ service_condcommand()
- 	service_exists $1 && service_status $1 && service_cmd $1 $2
- }
- 
-+# Set MTU for an interface
-+set_mtu() {
-+	local interface=$1 mtu=$2
-+
-+	if [ -e /sys/class/net/$interface/mtu ]; then
-+		echo "$mtu" > /sys/class/net/$interface/mtu
-+	else
-+		ifconfig "$interface" mtu "$mtu"
-+	fi
-+}
-+
- # We source each script into this one so that scripts run earlier can
- # remove variables from the environment so later scripts don't see them.
- # Thus, the user can create their dhcpcd.enter/exit-hook script to configure
--- 
-1.7.5.4
-
diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD
deleted file mode 100644
index bbd406199..000000000
--- a/testing/dhcpcd/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 166018 2012-09-04 06:17:52Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Killian <tom.archlinux.org>
-# Contributor: Judd Vinet <jvinet.zeroflux.org>
-
-pkgname=dhcpcd
-pkgver=5.6.2
-pkgrel=1
-pkgdesc="RFC2131 compliant DHCP client daemon"
-url="http://roy.marples.name/projects/dhcpcd/"
-arch=('i686' 'x86_64')
-license=('BSD')
-groups=('base')
-depends=('glibc' 'sh')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
-options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd.conf.d' 'dhcpcd.service')
-sha1sums=('7127237b5594ba50642829e76033a04d1c6fd42e'
-          'b67b9ce6a2faaca75fea356966a16be2283b7db0'
-          '3d0542eab1b89a88d56ca427128228ac72c40d1f')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # configure variables
-  ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
-	--rundir=/run
-
-  # Build
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # Create Binary Symlink
-  install -d ${pkgdir}/usr/sbin
-  ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
-
-  # Install Configuration File used in /etc/rc.d/network
-  install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
-  # Install License
-  install -d $pkgdir/usr/share/licenses/$pkgname
-  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
-        >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # Set Options in /etc/dhcpcd.conf
-  echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
-
-  # install systemd files
-  install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service
-}
diff --git a/testing/dhcpcd/dhcpcd.conf.d b/testing/dhcpcd/dhcpcd.conf.d
deleted file mode 100644
index 83c6f14ad..000000000
--- a/testing/dhcpcd/dhcpcd.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP client daemon
-#
-
-DHCPCD_ARGS="-q"
-
diff --git a/testing/dhcpcd/dhcpcd.service b/testing/dhcpcd/dhcpcd.service
deleted file mode 100644
index 25a1923ac..000000000
--- a/testing/dhcpcd/dhcpcd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=dhcpcd on %I
-Wants=network.target
-Before=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd-%I.pid
-ExecStart=/sbin/dhcpcd -A -q -w %I
-ExecStop=/sbin/dhcpcd -k %I
-
-[Install]
-Alias=multi-user.target.wants/dhcpcd@eth0.service
diff --git a/testing/dhcpcd/remove_ifconfig.patch b/testing/dhcpcd/remove_ifconfig.patch
deleted file mode 100644
index 5bcc4a68f..000000000
--- a/testing/dhcpcd/remove_ifconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dhcpcd-hooks/10-mtu.orig	2011-11-04 07:45:46.477712667 +0100
-+++ dhcpcd-hooks/10-mtu	2011-11-04 07:46:38.964379550 +0100
-@@ -7,7 +7,7 @@
- elif [ -n "$new_interface_mtu" ] && $if_up; then
- 	# The smalled MTU dhcpcd can work with is 576
- 	if [ "$new_interface_mtu" -ge 576 ]; then
--		if ifconfig "$interface" mtu "$new_interface_mtu"; then
-+		if ip link set "$interface" mtu "$new_interface_mtu"; then
- 			syslog info "$interface: MTU set to $new_interface_mtu"
- 			# Save the MTU so we can restore it later
- 			if [ ! -e "$mtu_dir/$interface" ]; then
-@@ -21,7 +21,7 @@
- 		# No MTU in this state, so restore the prior MTU
- 		mtu=$(cat "$mtu_dir/$interface")
- 		syslog info "$interface: MTU restored to $mtu"
--		ifconfig "$interface" mtu "$mtu"
-+		ip link set "$interface" mtu "$new_interface_mtu"
- 		rm "$mtu_dir/$interface"
- 	fi
- fi
diff --git a/testing/dialog/PKGBUILD b/testing/dialog/PKGBUILD
deleted file mode 100644
index f324a31f4..000000000
--- a/testing/dialog/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 163091 2012-07-06 20:37:15Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=dialog
-pkgver=1.1_20120706
-pkgrel=1
-pkgdesc="A tool to display dialog boxes from shell scripts"
-arch=('i686' 'x86_64')
-url="http://invisible-island.net/dialog/"
-license=('LGPL2.1')
-depends=('ncurses')
-source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
-sha1sums=('fa033f0fb166da86e29d70e68159a92a9b9cdb84')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver/_/-}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-              --with-ncursesw --enable-nls
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver/_/-}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/testing/digikam/PKGBUILD b/testing/digikam/PKGBUILD
deleted file mode 100644
index 8395a2b05..000000000
--- a/testing/digikam/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 164633 2012-08-01 16:13:17Z andrea $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.7.0
-pkgrel=2
-pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.digikam.org/"
-makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
-             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('43f51c389984538025f185acf8902a923eb0268b')
-
-build() {
-  cd "${srcdir}"
-
-  mkdir build
-  cd build
-  # Use internal lensfun (FS#21816)
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DLENSFUN_LIBRARY="" \
-    -DLENSFUN_INCLUDE_DIR=""
-  make
-}
-
-package_digikam() {
-  pkgdesc="Digital photo management application for KDE"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
-           'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap')
-  optdepends=('kipi-plugins: for more extras and plugins')
-  install=digikam.install
-
-  cd "${srcdir}"/build/core
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/po
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkface() {
-  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
-  depends=('kdelibs' 'opencv')
-
-  cd "${srcdir}"/build/extra/libkface
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkgeomap() {
-  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
-
-  cd "${srcdir}"/build/extra/libkgeomap
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkvkontakte() {
-  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
-  depends=('kdelibs' 'qjson')
-
-  cd "${srcdir}"/build/extra/libkvkontakte
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libmediawiki() {
-  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
-  depends=('kdelibs')
-
-  cd "${srcdir}"/build/extra/libmediawiki
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kipi-plugins() {
-  pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'qjson' 'libkvkontakte' 'libkexiv2')
-  optdepends=('libkgeomap'
-              'libmediawiki'
-              'libgpod'
-              'hugin')
-  install=kipi-plugins.install
-
-  cd "${srcdir}"/build/extra/kipi-plugins
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/digikam/digikam.install b/testing/digikam/digikam.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/digikam/digikam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/digikam/kipi-plugins.install b/testing/digikam/kipi-plugins.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/digikam/kipi-plugins.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD
deleted file mode 100644
index 9915ca8cf..000000000
--- a/testing/dmraid/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 161941 2012-06-16 17:17:25Z dreisner $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
-
-pkgname=dmraid
-pkgver=1.0.0.rc16.3
-pkgrel=7
-pkgdesc="Device mapper RAID interface"
-url="http://people.redhat.com/~heinzm/sw/dmraid/"
-conflicts=('mkinitcpio<0.7')
-depends=('device-mapper>=2.0.54')
-arch=('i686' 'x86_64')
-license=('GPL')
-source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
-        http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2
-        dmraid_install
-        dmraid_hook
-        dmraid_tmpfiles
-        dmraid.service)
-install=dmraid.install
-md5sums=('819338fcef98e8e25819f0516722beeb'
-         '2297d23cee1aef23ec6ad8d6d1870356'
-         'faec669dc85f87187b45b5d3968efe2c'
-         '56a8bb0ece8d206cd8efb504ee072ddd'
-         'de0af1fdb9ed4c109b8119160167d2e9')
-
-build() {
-  cd "$pkgname/1.0.0.rc16-3/$pkgname"
-  ./configure --enable-led --enable-intel_led
-  make
-}
-
-package() {
-  cd "$pkgname/1.0.0.rc16-3/$pkgname"
-  make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
-  install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid
-  install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid
-  install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf
-
-  # fix permissions
-  chmod 644 "$pkgdir"/usr/include/dmraid/* "$pkgdir"/usr/lib/libdmraid.a
-
-  install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service"
-}
diff --git a/testing/dmraid/dmraid.install b/testing/dmraid/dmraid.install
deleted file mode 100644
index 64899e785..000000000
--- a/testing/dmraid/dmraid.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then
-    # important upgrade notice
-    echo ">>>"
-    echo ">>> IMPORTANT DMRAID UPGRADE NOTICE"
-    echo ">>> -------------------------------"
-    echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:"
-    echo ">>> You need to add an additional 'p' in front of your number."
-    echo ">>> e.g. <yourname><number> --> <yourname>p<number>"
-    echo ">>>      firsthd1           --> firsthdp1"
-    echo ">>> Please change your bootloader and fstab accordingly."
-    echo ">>>"
-  fi
-}
diff --git a/testing/dmraid/dmraid.service b/testing/dmraid/dmraid.service
deleted file mode 100644
index 1fd142ff2..000000000
--- a/testing/dmraid/dmraid.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Assemble FakeRAID arrays
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service
-Before=basic.target shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/dmraid --ignorelocking --activate y -Z
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=true
-
-[Install]
-WantedBy=basic.target
diff --git a/testing/dmraid/dmraid_hook b/testing/dmraid/dmraid_hook
deleted file mode 100644
index 37283e83e..000000000
--- a/testing/dmraid/dmraid_hook
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1
-    msg ":: Activating dmraid arrays..."
-    # prevent any event monitoring calls with -I
-    if [ "$quiet" = "y" ]; then
-        dmraid -ay -I -Z >/dev/null
-    else
-        dmraid -ay -I -Z
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install
deleted file mode 100644
index d3238c1f7..000000000
--- a/testing/dmraid/dmraid_install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module 'dm-mod'
-    add_module 'dm-mirror'
-
-    add_binary 'dmraid'
-    add_binary 'dmsetup'
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook loads the necessary modules for a dmraid root device.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/dmraid/dmraid_tmpfiles b/testing/dmraid/dmraid_tmpfiles
deleted file mode 100644
index 4f21ac1fc..000000000
--- a/testing/dmraid/dmraid_tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/lock/dmraid 1777 root root
diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD
deleted file mode 100644
index d563d0b31..000000000
--- a/testing/dnsutils/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168390 2012-10-09 22:10:12Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: mario <mario_vazq@hotmail.com>
-
-pkgname=dnsutils
-_pkgver=9.9.2
-pkgver=${_pkgver//-/.}
-pkgrel=1
-pkgdesc='DNS utilities: dig host nslookup'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64')
-options=('!makeflags')
-depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'remove-bind.patch')
-sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
-          'bb13bd54134e4d787469be25461a3cc3f5cb57f4')
-
-replaces=('bind-tools' 'host')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-bind.patch
-	export STD_CDEFINES='-DDIG_SIGCHASE'
-
-	# hack to remove unused bloat from the binaries
-	CFLAGS+=' -fdata-sections -ffunction-sections'
-	LDFLAGS+=' -Wl,--gc-sections'
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-idn \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	cd bin; make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch
deleted file mode 100644
index 8d4b49848..000000000
--- a/testing/dnsutils/remove-bind.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
-@@ -19,8 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
--		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
-+SUBDIRS =	dig
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff -aur old/lib/Makefile.in new/lib/Makefile.in
---- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
-+++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
-@@ -23,7 +23,7 @@
- # Attempt to disable parallel processing.
- .NOTPARALLEL:
- .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS =	isc dns isccfg bind9 lwres
- TARGETS =
- 
- @BIND9_MAKE_RULES@
diff --git a/testing/dvdauthor/PKGBUILD b/testing/dvdauthor/PKGBUILD
deleted file mode 100644
index 05058218d..000000000
--- a/testing/dvdauthor/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169632 2012-10-25 01:34:55Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca> 
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de>
-
-pkgname=dvdauthor
-pkgver=0.7.1
-pkgrel=2
-pkgdesc="DVD authoring tools"
-arch=('i686' 'x86_64')
-url="http://dvdauthor.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2694a5a3ef460106ea3caf0f7f60ff80')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch
deleted file mode 100644
index 2bb636380..000000000
--- a/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
- 
- #include <png.h>
-+#include <zlib.h>
- 
- #include "rgb.h"
- #include "common.h"
-@@ -610,7 +611,7 @@
-         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-         return -1;
-       } /*if*/
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-       {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         fclose(fp);
diff --git a/testing/e2fsprogs/MIT-LICENSE b/testing/e2fsprogs/MIT-LICENSE
deleted file mode 100644
index d849b28f2..000000000
--- a/testing/e2fsprogs/MIT-LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2003-2007 Theodore Ts'o <tytso@mit.edu>
-Copyright (c) 1997-2003 Yann Dirson <dirson@debian.org>
-Copyright (c) 2001 Alcove <http://www.alcove.com/>
-Copyright (c) 1997 Klee Dienes
-Copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk>
-
-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 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/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD
deleted file mode 100644
index 2b9b9f152..000000000
--- a/testing/e2fsprogs/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 168762 2012-10-15 19:04:27Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org> 
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=e2fsprogs
-pkgver=1.42.6
-pkgrel=1
-pkgdesc="Ext2/3/4 filesystem utilities"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'MIT')
-url="http://e2fsprogs.sourceforge.net"
-groups=('base')
-depends=('sh' 'util-linux')
-makedepends=('bc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'MIT-LICENSE')
-backup=('etc/mke2fs.conf')
-install=${pkgname}.install
-sha1sums=('cd05cd4205a00d01a6da821660cff386788e9be3'
-          'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Remove unnecessary init.d directory
-  sed -i '/init\.d/s|^|#|' misc/Makefile.in
-
-  ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \
-      --enable-elf-shlibs --disable-fsck --disable-uuidd \
-      --disable-libuuid --disable-libblkid
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install install-libs
-
-  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
-  
-  # remove references to build directory
-  sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
-  sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
-
-  # install MIT license
-  install -Dm644 "${srcdir}/MIT-LICENSE" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
-}
diff --git a/testing/e2fsprogs/e2fsprogs.install b/testing/e2fsprogs/e2fsprogs.install
deleted file mode 100644
index 1a7fe20d7..000000000
--- a/testing/e2fsprogs/e2fsprogs.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libext2fs.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/e2fsprogs/mke2fs.conf b/testing/e2fsprogs/mke2fs.conf
deleted file mode 100644
index 92464e3b4..000000000
--- a/testing/e2fsprogs/mke2fs.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-[defaults]
-	base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
-	blocksize = 4096
-	inode_size = 128
-	inode_ratio = 16384
-
-[fs_types]
-	small = {
-		blocksize = 1024
-		inode_size = 128
-		inode_ratio = 4096
-	}
-	floppy = {
-		blocksize = 1024
-		inode_size = 128
-		inode_ratio = 8192
-	}
-	news = {
-		inode_ratio = 4096
-	}
-	largefile = {
-		inode_ratio = 1048576
-	}
-	largefile4 = {
-		inode_ratio = 4194304
-	}
diff --git a/testing/eclipse/PKGBUILD b/testing/eclipse/PKGBUILD
deleted file mode 100644
index 22b3840a0..000000000
--- a/testing/eclipse/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 163177 2012-07-08 12:52:55Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
-# Contributor: Andreas W. Hauser <andy-aur@splashground.de>
-# Contributor: Marco Crosio <marco.crosio@gmail.com>
-
-pkgname=eclipse
-pkgver=4.2
-pkgrel=1
-_date=201206081400
-pkgdesc="An IDE for Java and other languages"
-arch=('i686' 'x86_64')
-url="http://eclipse.org"
-depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst')
-install=${pkgname}.install
-makedepends=('zip')
-conflicts=('xulrunner')
-license=("EPL/1.1")
-source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
-	 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
-md5sums=('506b9f4e3919ebe3d6a717cd9bef5e07'
-         '7ea99a30fbaf06ec29261541b8eb1e23'
-         'ba8a37e30a7ebd69774cec87c69e8c44'
-         '77cff7543ccf7e177cb6667f5a20ce19')
-[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz"
-[ "$CARCH" = "x86_64" ] && md5sums[0]='804938dd087c310d8bfd54c8024afbbd'
-
-package() {
-  # install eclipse
-  install -m755 -d "$pkgdir/usr/share"
-  mv eclipse "$pkgdir/usr/share/"
-
-  # install misc
-  install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \
-    $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps
-  install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse"
-  install -m644 eclipse.desktop "$pkgdir/usr/share/applications/"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \
-    "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \
-    "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \
-    "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse256.png \
-    "$pkgdir/usr/share/icons/hicolor/256x256/apps/eclipse.png"
-
-  # install icon
-  install -Dm644 "$srcdir"/eclipse.svg \
-    "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg
-  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.py
-}
diff --git a/testing/eclipse/eclipse.desktop b/testing/eclipse/eclipse.desktop
deleted file mode 100644
index 5b210c81e..000000000
--- a/testing/eclipse/eclipse.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse
-Comment=A Java Development Environment
-Icon=eclipse
-Exec=eclipse
-Terminal=false
-Type=Application
-Categories=Development;IDE;Java
-StartupNotify=true
diff --git a/testing/eclipse/eclipse.install b/testing/eclipse/eclipse.install
deleted file mode 100644
index a2930a4ff..000000000
--- a/testing/eclipse/eclipse.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/eclipse/eclipse.sh b/testing/eclipse/eclipse.sh
deleted file mode 100644
index 498d7fefb..000000000
--- a/testing/eclipse/eclipse.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-export ECLIPSE_HOME=/usr/share/eclipse
-export GDK_NATIVE_WINDOWS=true
-${ECLIPSE_HOME}/eclipse "$@"
diff --git a/testing/eclipse/eclipse.svg b/testing/eclipse/eclipse.svg
deleted file mode 100644
index 56316be9e..000000000
--- a/testing/eclipse/eclipse.svg
+++ /dev/null
@@ -1,1623 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2254"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   width="48"
-   height="48"
-   version="1.0"
-   sodipodi:docbase="/home/matt/eclipse33"
-   sodipodi:docname="eclipse-icon-clean.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-ubuntu.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata2259">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2257">
-    <linearGradient
-       id="linearGradient4373">
-      <stop
-         style="stop-color:#8ea6d6;stop-opacity:0.73762375;"
-         offset="0"
-         id="stop4375" />
-      <stop
-         style="stop-color:#bbc9e6;stop-opacity:1;"
-         offset="1"
-         id="stop4377" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4035">
-      <stop
-         style="stop-color:#7474bb;stop-opacity:1;"
-         offset="0"
-         id="stop4037" />
-      <stop
-         style="stop-color:#070553;stop-opacity:1;"
-         offset="1"
-         id="stop4039" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4003">
-      <stop
-         style="stop-color:#494991;stop-opacity:1;"
-         offset="0"
-         id="stop4005" />
-      <stop
-         style="stop-color:#695ae8;stop-opacity:1;"
-         offset="1"
-         id="stop4007" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3987">
-      <stop
-         style="stop-color:#414083;stop-opacity:1;"
-         offset="0"
-         id="stop3989" />
-      <stop
-         style="stop-color:#5649b9;stop-opacity:1;"
-         offset="1"
-         id="stop3991" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_8_"
-       gradientUnits="userSpaceOnUse"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0"
-         style="stop-color:#FEE8BD"
-         id="stop264" />
-      <stop
-         offset="0.0483"
-         style="stop-color:#FEEBC6"
-         id="stop266" />
-      <stop
-         offset="0.2334"
-         style="stop-color:#FFF6E5"
-         id="stop268" />
-      <stop
-         offset="0.3905"
-         style="stop-color:#FFFDF8"
-         id="stop270" />
-      <stop
-         offset="0.5"
-         style="stop-color:#FFFFFF"
-         id="stop272" />
-      <stop
-         offset="0.6094"
-         style="stop-color:#FFFDF9"
-         id="stop274" />
-      <stop
-         offset="0.7588"
-         style="stop-color:#FFF7E7"
-         id="stop276" />
-      <stop
-         offset="0.9306"
-         style="stop-color:#FEEDCB"
-         id="stop278" />
-      <stop
-         offset="1"
-         style="stop-color:#FEE8BD"
-         id="stop280" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_7_"
-       gradientUnits="userSpaceOnUse"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0"
-         style="stop-color:#A86E45"
-         id="stop205" />
-      <stop
-         offset="0.1124"
-         style="stop-color:#E8A06C"
-         id="stop207" />
-      <stop
-         offset="0.1609"
-         style="stop-color:#E59E6B"
-         id="stop209" />
-      <stop
-         offset="0.2012"
-         style="stop-color:#DA9969"
-         id="stop211" />
-      <stop
-         offset="0.2387"
-         style="stop-color:#C99066"
-         id="stop213" />
-      <stop
-         offset="0.2743"
-         style="stop-color:#B18461"
-         id="stop215" />
-      <stop
-         offset="0.3084"
-         style="stop-color:#92745A"
-         id="stop217" />
-      <stop
-         offset="0.3315"
-         style="stop-color:#786755"
-         id="stop219" />
-      <stop
-         offset="0.4068"
-         style="stop-color:#B5ACA2"
-         id="stop221" />
-      <stop
-         offset="0.478"
-         style="stop-color:#EAE8E5"
-         id="stop223" />
-      <stop
-         offset="0.5112"
-         style="stop-color:#FFFFFF"
-         id="stop225" />
-      <stop
-         offset="0.5376"
-         style="stop-color:#FDFCFC"
-         id="stop227" />
-      <stop
-         offset="0.5589"
-         style="stop-color:#F5F3F2"
-         id="stop229" />
-      <stop
-         offset="0.5783"
-         style="stop-color:#E8E4E1"
-         id="stop231" />
-      <stop
-         offset="0.5966"
-         style="stop-color:#D6CEC9"
-         id="stop233" />
-      <stop
-         offset="0.6142"
-         style="stop-color:#BFB3AA"
-         id="stop235" />
-      <stop
-         offset="0.6312"
-         style="stop-color:#A39185"
-         id="stop237" />
-      <stop
-         offset="0.6475"
-         style="stop-color:#816959"
-         id="stop239" />
-      <stop
-         offset="0.6517"
-         style="stop-color:#785E4C"
-         id="stop241" />
-      <stop
-         offset="0.671"
-         style="stop-color:#83654F"
-         id="stop243" />
-      <stop
-         offset="0.7414"
-         style="stop-color:#A87958"
-         id="stop245" />
-      <stop
-         offset="0.807"
-         style="stop-color:#C3895F"
-         id="stop247" />
-      <stop
-         offset="0.8652"
-         style="stop-color:#D39263"
-         id="stop249" />
-      <stop
-         offset="0.9101"
-         style="stop-color:#D99564"
-         id="stop251" />
-      <stop
-         offset="0.9278"
-         style="stop-color:#C48557"
-         id="stop253" />
-      <stop
-         offset="0.9557"
-         style="stop-color:#AA7045"
-         id="stop255" />
-      <stop
-         offset="0.9807"
-         style="stop-color:#9A633B"
-         id="stop257" />
-      <stop
-         offset="1"
-         style="stop-color:#945F37"
-         id="stop259" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_6_"
-       gradientUnits="userSpaceOnUse"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235"
-       gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)">
-      <stop
-         offset="0"
-         style="stop-color:#A86E45"
-         id="stop146" />
-      <stop
-         offset="0.1124"
-         style="stop-color:#E8A06C"
-         id="stop148" />
-      <stop
-         offset="0.1609"
-         style="stop-color:#E59E6B"
-         id="stop150" />
-      <stop
-         offset="0.2012"
-         style="stop-color:#DA9969"
-         id="stop152" />
-      <stop
-         offset="0.2387"
-         style="stop-color:#C99066"
-         id="stop154" />
-      <stop
-         offset="0.2743"
-         style="stop-color:#B18461"
-         id="stop156" />
-      <stop
-         offset="0.3084"
-         style="stop-color:#92745A"
-         id="stop158" />
-      <stop
-         offset="0.3315"
-         style="stop-color:#786755"
-         id="stop160" />
-      <stop
-         offset="0.4068"
-         style="stop-color:#B5ACA2"
-         id="stop162" />
-      <stop
-         offset="0.478"
-         style="stop-color:#EAE8E5"
-         id="stop164" />
-      <stop
-         offset="0.5112"
-         style="stop-color:#FFFFFF"
-         id="stop166" />
-      <stop
-         offset="0.5376"
-         style="stop-color:#FDFCFC"
-         id="stop168" />
-      <stop
-         offset="0.5589"
-         style="stop-color:#F5F3F2"
-         id="stop170" />
-      <stop
-         offset="0.5783"
-         style="stop-color:#E8E4E1"
-         id="stop172" />
-      <stop
-         offset="0.5966"
-         style="stop-color:#D6CEC9"
-         id="stop174" />
-      <stop
-         offset="0.6142"
-         style="stop-color:#BFB3AA"
-         id="stop176" />
-      <stop
-         offset="0.6312"
-         style="stop-color:#A39185"
-         id="stop178" />
-      <stop
-         offset="0.6475"
-         style="stop-color:#816959"
-         id="stop180" />
-      <stop
-         offset="0.6517"
-         style="stop-color:#785E4C"
-         id="stop182" />
-      <stop
-         offset="0.671"
-         style="stop-color:#83654F"
-         id="stop184" />
-      <stop
-         offset="0.7414"
-         style="stop-color:#A87958"
-         id="stop186" />
-      <stop
-         offset="0.807"
-         style="stop-color:#C3895F"
-         id="stop188" />
-      <stop
-         offset="0.8652"
-         style="stop-color:#D39263"
-         id="stop190" />
-      <stop
-         offset="0.9101"
-         style="stop-color:#D99564"
-         id="stop192" />
-      <stop
-         offset="0.9278"
-         style="stop-color:#C48557"
-         id="stop194" />
-      <stop
-         offset="0.9557"
-         style="stop-color:#AA7045"
-         id="stop196" />
-      <stop
-         offset="0.9807"
-         style="stop-color:#9A633B"
-         id="stop198" />
-      <stop
-         offset="1"
-         style="stop-color:#945F37"
-         id="stop200" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_5_"
-       gradientUnits="userSpaceOnUse"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0"
-         style="stop-color:#A86E45"
-         id="stop87" />
-      <stop
-         offset="0.1124"
-         style="stop-color:#E8A06C"
-         id="stop89" />
-      <stop
-         offset="0.1609"
-         style="stop-color:#E59E6B"
-         id="stop91" />
-      <stop
-         offset="0.2012"
-         style="stop-color:#DA9969"
-         id="stop93" />
-      <stop
-         offset="0.2387"
-         style="stop-color:#C99066"
-         id="stop95" />
-      <stop
-         offset="0.2743"
-         style="stop-color:#B18461"
-         id="stop97" />
-      <stop
-         offset="0.3084"
-         style="stop-color:#92745A"
-         id="stop99" />
-      <stop
-         offset="0.3315"
-         style="stop-color:#786755"
-         id="stop101" />
-      <stop
-         offset="0.4068"
-         style="stop-color:#B5ACA2"
-         id="stop103" />
-      <stop
-         offset="0.478"
-         style="stop-color:#EAE8E5"
-         id="stop105" />
-      <stop
-         offset="0.5112"
-         style="stop-color:#FFFFFF"
-         id="stop107" />
-      <stop
-         offset="0.5376"
-         style="stop-color:#FDFCFC"
-         id="stop109" />
-      <stop
-         offset="0.5589"
-         style="stop-color:#F5F3F2"
-         id="stop111" />
-      <stop
-         offset="0.5783"
-         style="stop-color:#E8E4E1"
-         id="stop113" />
-      <stop
-         offset="0.5966"
-         style="stop-color:#D6CEC9"
-         id="stop115" />
-      <stop
-         offset="0.6142"
-         style="stop-color:#BFB3AA"
-         id="stop117" />
-      <stop
-         offset="0.6312"
-         style="stop-color:#A39185"
-         id="stop119" />
-      <stop
-         offset="0.6475"
-         style="stop-color:#816959"
-         id="stop121" />
-      <stop
-         offset="0.6517"
-         style="stop-color:#785E4C"
-         id="stop123" />
-      <stop
-         offset="0.671"
-         style="stop-color:#83654F"
-         id="stop125" />
-      <stop
-         offset="0.7414"
-         style="stop-color:#A87958"
-         id="stop127" />
-      <stop
-         offset="0.807"
-         style="stop-color:#C3895F"
-         id="stop129" />
-      <stop
-         offset="0.8652"
-         style="stop-color:#D39263"
-         id="stop131" />
-      <stop
-         offset="0.9101"
-         style="stop-color:#D99564"
-         id="stop133" />
-      <stop
-         offset="0.9278"
-         style="stop-color:#C48557"
-         id="stop135" />
-      <stop
-         offset="0.9557"
-         style="stop-color:#AA7045"
-         id="stop137" />
-      <stop
-         offset="0.9807"
-         style="stop-color:#9A633B"
-         id="stop139" />
-      <stop
-         offset="1"
-         style="stop-color:#945F37"
-         id="stop141" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_2_"
-       gradientUnits="userSpaceOnUse"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0"
-         style="stop-color:#A86E45"
-         id="stop60" />
-      <stop
-         offset="0.5787"
-         style="stop-color:#785E4C"
-         id="stop62" />
-      <stop
-         offset="1"
-         style="stop-color:#945F37"
-         id="stop64" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_1_"
-       gradientUnits="userSpaceOnUse"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0.0056"
-         style="stop-color:#9C6137"
-         id="stop47" />
-      <stop
-         offset="0.1685"
-         style="stop-color:#C98452"
-         id="stop49" />
-      <stop
-         offset="0.5337"
-         style="stop-color:#CD8D5F"
-         id="stop51" />
-      <stop
-         offset="0.809"
-         style="stop-color:#C47D4A"
-         id="stop53" />
-      <stop
-         offset="1"
-         style="stop-color:#9C6137"
-         id="stop55" />
-    </linearGradient>
-    <radialGradient
-       id="light_1_"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0.264"
-         style="stop-color:#FFFFFF;"
-         id="stop37" />
-      <stop
-         offset="2.5"
-         style="stop-color:#FFF18F;stop-opacity:0"
-         id="stop39" />
-    </radialGradient>
-    <radialGradient
-       id="XMLID_10_"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114"
-       gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0.3427"
-         style="stop-color:#FFFFFF"
-         id="stop8" />
-      <stop
-         offset="0.3754"
-         style="stop-color:#ECECEC"
-         id="stop10" />
-      <stop
-         offset="0.4665"
-         style="stop-color:#BCBCBC"
-         id="stop12" />
-      <stop
-         offset="0.5531"
-         style="stop-color:#979797"
-         id="stop14" />
-      <stop
-         offset="0.6331"
-         style="stop-color:#7C7C7C"
-         id="stop16" />
-      <stop
-         offset="0.704"
-         style="stop-color:#6C6C6C"
-         id="stop18" />
-      <stop
-         offset="0.7584"
-         style="stop-color:#666666"
-         id="stop20" />
-    </radialGradient>
-    <linearGradient
-       id="XMLID_4_"
-       gradientUnits="userSpaceOnUse"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)">
-      <stop
-         offset="0"
-         style="stop-color:#FCB462"
-         id="stop40" />
-      <stop
-         offset="1"
-         style="stop-color:#FCAF55"
-         id="stop42" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_3_"
-       gradientUnits="userSpaceOnUse"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)">
-      <stop
-         offset="0"
-         style="stop-color:#F99D77"
-         id="stop33" />
-      <stop
-         offset="1"
-         style="stop-color:#F7804E"
-         id="stop35" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4035"
-       id="linearGradient4041"
-       x1="-43.03101"
-       y1="8.6383018"
-       x2="-15.677965"
-       y2="37.492428"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4035"
-       id="linearGradient4189"
-       gradientUnits="userSpaceOnUse"
-       x1="-43.03101"
-       y1="8.6383018"
-       x2="-15.677965"
-       y2="37.492428" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4181">
-      <g
-         id="g4183"
-         transform="matrix(0.7925926,0,0,0.8907563,4.6132029,-3.2693226)">
-        <path
-           transform="translate(-15.844752,8.8397036)"
-           d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-           sodipodi:ry="20.014421"
-           sodipodi:rx="20.014421"
-           sodipodi:cy="23.982693"
-           sodipodi:cx="-30.021633"
-           id="path4185"
-           style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-        <path
-           transform="translate(-13.843309,8.8397036)"
-           d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-           sodipodi:ry="20.014421"
-           sodipodi:rx="20.014421"
-           sodipodi:cy="23.982693"
-           sodipodi:cx="-30.021633"
-           id="path4187"
-           style="opacity:1;fill:url(#linearGradient4189);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-      </g>
-    </mask>
-    <filter
-       inkscape:collect="always"
-       x="-0.42083731"
-       width="1.8416746"
-       y="-0.42480746"
-       height="1.8496149"
-       id="filter4267">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.12931"
-         id="feGaussianBlur4269" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4035"
-       id="linearGradient4301"
-       gradientUnits="userSpaceOnUse"
-       x1="-43.03101"
-       y1="8.6383018"
-       x2="-15.677965"
-       y2="37.492428" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4297">
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#linearGradient4301);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path4299"
-         sodipodi:cx="-30.021633"
-         sodipodi:cy="23.982693"
-         sodipodi:rx="20.014421"
-         sodipodi:ry="20.014421"
-         d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-         transform="translate(3.5679857,1.3974438)" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4003"
-       id="linearGradient4368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9683099,0,0,0.9683099,47.162254,-1.0174889)"
-       x1="-47.534256"
-       y1="2.9675496"
-       x2="-0.16679382"
-       y2="49.50108" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4003"
-       id="linearGradient4371"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0105249,0,0,1.0105249,3.4549308e-2,-50.022066)"
-       x1="-47.534256"
-       y1="2.9675496"
-       x2="-0.16679382"
-       y2="49.50108" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4423">
-      <path
-         transform="translate(4.9557997,-4.7430601e-2)"
-         d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-         sodipodi:ry="20.014421"
-         sodipodi:rx="20.014421"
-         sodipodi:cy="23.982693"
-         sodipodi:cx="-30.021633"
-         id="path4425"
-         style="opacity:1;fill:url(#linearGradient4427);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         sodipodi:type="arc" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4035"
-       id="linearGradient4427"
-       gradientUnits="userSpaceOnUse"
-       x1="-43.03101"
-       y1="8.6383018"
-       x2="-15.677965"
-       y2="37.492428" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4373"
-       id="linearGradient4429"
-       gradientUnits="userSpaceOnUse"
-       x1="-46.468069"
-       y1="19.312662"
-       x2="-6.439226"
-       y2="19.312662" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4373"
-       id="linearGradient4431"
-       gradientUnits="userSpaceOnUse"
-       x1="-46.468067"
-       y1="22.481251"
-       x2="-6.4392262"
-       y2="22.481251" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4373"
-       id="linearGradient4433"
-       gradientUnits="userSpaceOnUse"
-       x1="-46.468067"
-       y1="25.482334"
-       x2="-6.4392262"
-       y2="25.482334" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4373"
-       id="linearGradient4435"
-       gradientUnits="userSpaceOnUse"
-       x1="-46.468067"
-       y1="28.481611"
-       x2="-6.4392262"
-       y2="28.481611" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="radialGradient4753"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#light_1_"
-       id="radialGradient4755"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_1_"
-       id="linearGradient4757"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_2_"
-       id="linearGradient4759"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient4761"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient4763"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_5_"
-       id="linearGradient4765"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_6_"
-       id="linearGradient4767"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_7_"
-       id="linearGradient4769"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_8_"
-       id="linearGradient4771"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="radialGradient4817"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#light_1_"
-       id="radialGradient4819"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_1_"
-       id="linearGradient4821"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_2_"
-       id="linearGradient4823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient4825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient4827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_5_"
-       id="linearGradient4829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_6_"
-       id="linearGradient4831"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_7_"
-       id="linearGradient4833"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_8_"
-       id="linearGradient4835"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7503">
-      <g
-         id="g7505"
-         transform="matrix(7.4511206,0,0,7.4511206,305.77432,266.76067)">
-        <path
-           id="path7507"
-           d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z "
-           style="opacity:0.2;fill:#141414" />
-        <path
-           id="path7509"
-           d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z "
-           style="opacity:0.2;fill:#141414" />
-        <path
-           id="path7511"
-           d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z "
-           style="fill:url(#radialGradient7547)" />
-        <path
-           id="path7513"
-           d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z "
-           style="opacity:0.4;fill:#ffbf61" />
-        <path
-           id="path7515"
-           d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-           style="opacity:0.2;fill:#ff8b17" />
-        <path
-           id="path7517"
-           d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-           style="opacity:0.2;fill:#ff8b17" />
-        <path
-           id="path7519"
-           d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-           style="opacity:0.4;fill:#ff8b17" />
-        <path
-           id="path7521"
-           d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-           style="opacity:0.2;fill:#ffbf61" />
-        <path
-           id="path7523"
-           d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z "
-           style="fill:#cba572" />
-        <path
-           id="path7525"
-           d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z "
-           style="fill:#9e8c68" />
-        <path
-           id="path7527"
-           d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z "
-           style="fill:#966746" />
-        <path
-           id="path7529"
-           d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z "
-           style="fill:url(#linearGradient7549)" />
-        <path
-           id="path7531"
-           d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z "
-           style="fill:url(#linearGradient7551)" />
-        <path
-           id="path7533"
-           d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z "
-           style="fill:url(#linearGradient7553)" />
-        <path
-           id="path7535"
-           d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z "
-           style="fill:url(#linearGradient7555)" />
-        <path
-           id="path7537"
-           d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z "
-           style="fill:url(#linearGradient7557)" />
-        <path
-           id="path7539"
-           d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z "
-           style="fill:url(#linearGradient7559)" />
-        <path
-           id="path7541"
-           d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z "
-           style="fill:url(#linearGradient7561)" />
-        <path
-           id="path7543"
-           d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z "
-           style="fill:url(#linearGradient7563)" />
-        <path
-           id="path7545"
-           d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z "
-           style="fill:#3f3f3f" />
-      </g>
-    </clipPath>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="radialGradient7547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_1_"
-       id="linearGradient7549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_2_"
-       id="linearGradient7551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient7553"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient7555"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_5_"
-       id="linearGradient7557"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_6_"
-       id="linearGradient7559"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_7_"
-       id="linearGradient7561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_8_"
-       id="linearGradient7563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#light_1_"
-       id="radialGradient7653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="radialGradient8092"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_1_"
-       id="linearGradient8094"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_2_"
-       id="linearGradient8096"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient8098"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient8100"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_5_"
-       id="linearGradient8102"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_6_"
-       id="linearGradient8104"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_7_"
-       id="linearGradient8106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_8_"
-       id="linearGradient8108"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#light_1_"
-       id="radialGradient8110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask8044">
-      <g
-         id="g8046"
-         transform="translate(8.8639968,22.032387)">
-        <g
-           id="g8048">
-          <path
-             style="opacity:0.2;fill:#141414"
-             d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z "
-             id="path8050" />
-          <path
-             style="opacity:0.2;fill:#141414"
-             d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z "
-             id="path8052" />
-          <path
-             style="fill:url(#radialGradient8092)"
-             d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z "
-             id="path8054" />
-          <path
-             style="opacity:0.4;fill:#ffbf61"
-             d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z "
-             id="path8056" />
-          <path
-             style="opacity:0.2;fill:#ff8b17"
-             d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-             id="path8058" />
-          <path
-             style="opacity:0.2;fill:#ff8b17"
-             d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-             id="path8060" />
-          <path
-             style="opacity:0.4;fill:#ff8b17"
-             d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-             id="path8062" />
-          <path
-             style="opacity:0.2;fill:#ffbf61"
-             d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-             id="path8064" />
-          <path
-             style="fill:#cba572"
-             d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z "
-             id="path8066" />
-          <path
-             style="fill:#9e8c68"
-             d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z "
-             id="path8068" />
-          <path
-             style="fill:#966746"
-             d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z "
-             id="path8070" />
-          <path
-             style="fill:url(#linearGradient8094)"
-             d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z "
-             id="path8072" />
-          <path
-             style="fill:url(#linearGradient8096)"
-             d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z "
-             id="path8074" />
-          <path
-             style="fill:url(#linearGradient8098)"
-             d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z "
-             id="path8076" />
-          <path
-             style="fill:url(#linearGradient8100)"
-             d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z "
-             id="path8078" />
-          <path
-             style="fill:url(#linearGradient8102)"
-             d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z "
-             id="path8080" />
-          <path
-             style="fill:url(#linearGradient8104)"
-             d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z "
-             id="path8082" />
-          <path
-             style="fill:url(#linearGradient8106)"
-             d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z "
-             id="path8084" />
-          <path
-             style="fill:url(#linearGradient8108)"
-             d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z "
-             id="path8086" />
-          <path
-             style="fill:#3f3f3f"
-             d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z "
-             id="path8088" />
-        </g>
-        <ellipse
-           clip-path="url(#clipPath7503)"
-           transform="matrix(0.134208,0,0,0.134208,-41.03736,-36.195284)"
-           ry="60.116001"
-           rx="60.125"
-           cy="44.278999"
-           cx="64.5"
-           id="ellipse8090"
-           style="fill:url(#radialGradient8110)"
-           sodipodi:cx="64.5"
-           sodipodi:cy="44.278999"
-           sodipodi:rx="60.125"
-           sodipodi:ry="60.116001" />
-      </g>
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient8386"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient8388"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient8470"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient8472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask8432">
-      <g
-         style="overflow:visible"
-         id="g8434"
-         transform="matrix(0.1570828,0,0,0.1570828,-28.616402,11.0008)">
-        <path
-           id="path8436"
-           d="M 51.868,84.936 C 45.459,79.297 41.784,71.221 41.784,62.78 C 41.784,54.276 45.498,46.164 51.974,40.523 C 52.339,40.204 52.419,39.667 52.16,39.256 L 42.036,23.192 C 41.888,22.958 41.648,22.796 41.375,22.748 C 41.102,22.7 40.819,22.769 40.602,22.937 C 32.334,29.305 26.119,38.265 23.1,48.167 C 22.982,48.554 23.112,48.974 23.431,49.226 C 27.586,52.517 30.066,57.583 30.066,62.779 C 30.066,67.975 27.585,73.043 23.429,76.334 C 23.112,76.585 22.98,77.004 23.098,77.392 C 26.093,87.211 32.238,96.12 40.404,102.474 C 40.623,102.645 40.903,102.715 41.177,102.667 C 41.45,102.62 41.691,102.459 41.84,102.226 L 52.049,86.204 C 52.309,85.794 52.232,85.256 51.868,84.936 z M 12.803,50.223 C 5.732,50.223 0,55.951 0,63.016 C 0,70.081 5.732,75.81 12.803,75.81 C 19.874,75.81 25.606,70.081 25.606,63.016 C 25.606,55.951 19.874,50.223 12.803,50.223 z M 58.779,35.162 C 59.036,35.57 59.551,35.732 59.996,35.545 C 63.75,33.958 67.65,33.153 71.586,33.153 C 86.064,33.153 98.693,43.887 100.963,58.122 C 101.039,58.6 101.451,58.951 101.934,58.951 L 121.014,58.98 C 121.292,58.98 121.557,58.863 121.744,58.657 C 121.931,58.451 122.021,58.178 121.995,57.9 C 120.967,47.338 116.471,37.15 109.336,29.215 C 109.014,28.855 108.477,28.783 108.07,29.046 C 105.193,30.904 101.925,31.888 98.623,31.888 C 88.99,31.888 81.154,24.098 81.153,14.524 C 81.154,14.519 81.172,14.158 81.172,14.142 C 81.172,13.665 80.829,13.254 80.356,13.172 C 77.344,12.65 74.394,12.284 71.586,12.284 C 63.875,12.284 56.084,14.221 49.054,17.695 C 48.804,17.819 48.618,18.043 48.543,18.311 C 48.467,18.579 48.509,18.866 48.657,19.102 L 58.779,35.162 z M 98,27.5 C 104.908,27.5 110.51,21.902 110.51,15 C 110.51,8.096 104.908,2.5 98,2.5 C 91.092,2.5 85.49,8.096 85.49,15 C 85.49,21.902 91.092,27.5 98,27.5 z M 120.994,66.733 L 101.916,66.795 C 101.435,66.796 101.024,67.147 100.947,67.621 C 98.646,81.75 86.024,92.405 71.586,92.405 C 67.604,92.405 63.66,91.581 59.864,89.955 C 59.42,89.766 58.906,89.925 58.645,90.33 L 48.442,106.345 C 48.293,106.58 48.25,106.867 48.324,107.136 C 48.398,107.404 48.583,107.629 48.832,107.753 C 55.917,111.3 63.786,113.174 71.586,113.174 C 74.479,113.174 77.492,112.901 80.541,112.36 C 80.969,112.285 81.297,111.936 81.348,111.505 C 82.364,102.73 89.791,96.112 98.623,96.112 C 101.361,96.112 104.147,96.81 106.679,98.13 C 107.064,98.331 107.533,98.257 107.838,97.946 C 115.823,89.803 120.846,79.104 121.978,67.817 C 122.006,67.54 121.915,67.264 121.727,67.057 C 121.539,66.85 121.272,66.732 120.994,66.733 z M 98.486,100.545 C 91.415,100.545 85.682,106.242 85.682,113.273 C 85.682,120.302 91.414,126.001 98.486,126.001 C 105.556,126.001 111.289,120.303 111.289,113.273 C 111.289,106.242 105.557,100.545 98.486,100.545 z "
-           style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
-        <path
-           id="path8438"
-           d="M 51.868,85.936 C 45.459,80.297 41.784,72.221 41.784,63.78 C 41.784,55.276 45.498,47.164 51.974,41.523 C 52.339,41.204 52.419,40.667 52.16,40.256 L 42.036,24.192 C 41.888,23.958 41.648,23.796 41.375,23.748 C 41.102,23.7 40.819,23.769 40.602,23.937 C 32.334,30.305 26.119,39.265 23.1,49.167 C 22.982,49.554 23.112,49.974 23.431,50.226 C 27.586,53.517 30.066,58.583 30.066,63.779 C 30.066,68.975 27.585,74.043 23.429,77.334 C 23.112,77.585 22.98,78.004 23.098,78.392 C 26.093,88.211 32.238,97.12 40.404,103.474 C 40.623,103.645 40.903,103.715 41.177,103.667 C 41.45,103.62 41.691,103.459 41.84,103.226 L 52.049,87.204 C 52.309,86.794 52.232,86.256 51.868,85.936 z M 12.803,51.223 C 5.732,51.223 0,56.951 0,64.016 C 0,71.081 5.732,76.81 12.803,76.81 C 19.874,76.81 25.606,71.081 25.606,64.016 C 25.606,56.951 19.874,51.223 12.803,51.223 z M 58.779,36.162 C 59.036,36.57 59.551,36.732 59.996,36.545 C 63.75,34.958 67.65,34.153 71.586,34.153 C 86.064,34.153 98.693,44.887 100.963,59.122 C 101.039,59.6 101.451,59.951 101.934,59.951 L 121.014,59.98 C 121.292,59.98 121.557,59.863 121.744,59.657 C 121.931,59.451 122.021,59.178 121.995,58.9 C 120.967,48.338 116.471,38.15 109.336,30.215 C 109.014,29.855 108.477,29.783 108.07,30.046 C 105.193,31.904 101.925,32.888 98.623,32.888 C 88.99,32.888 81.154,25.098 81.153,15.524 C 81.154,15.519 81.172,15.158 81.172,15.142 C 81.172,14.665 80.829,14.254 80.356,14.172 C 77.344,13.65 74.394,13.284 71.586,13.284 C 63.875,13.284 56.084,15.221 49.054,18.695 C 48.804,18.819 48.618,19.043 48.543,19.311 C 48.467,19.579 48.509,19.866 48.657,20.102 L 58.779,36.162 z M 98,28.5 C 104.908,28.5 110.51,22.902 110.51,16 C 110.51,9.096 104.908,3.5 98,3.5 C 91.092,3.5 85.49,9.096 85.49,16 C 85.49,22.902 91.092,28.5 98,28.5 z M 120.994,67.733 L 101.916,67.795 C 101.435,67.796 101.024,68.147 100.947,68.621 C 98.646,82.75 86.024,93.405 71.586,93.405 C 67.604,93.405 63.66,92.581 59.864,90.955 C 59.42,90.766 58.906,90.925 58.645,91.33 L 48.442,107.345 C 48.293,107.58 48.25,107.867 48.324,108.136 C 48.398,108.404 48.583,108.629 48.832,108.753 C 55.917,112.3 63.786,114.174 71.586,114.174 C 74.479,114.174 77.492,113.901 80.541,113.36 C 80.969,113.285 81.297,112.936 81.348,112.505 C 82.364,103.73 89.791,97.112 98.623,97.112 C 101.361,97.112 104.147,97.81 106.679,99.13 C 107.064,99.331 107.533,99.257 107.838,98.946 C 115.823,90.803 120.846,80.104 121.978,68.817 C 122.006,68.54 121.915,68.264 121.727,68.057 C 121.539,67.85 121.272,67.732 120.994,67.733 z M 98.486,101.545 C 91.415,101.545 85.682,107.242 85.682,114.273 C 85.682,121.302 91.414,127.001 98.486,127.001 C 105.556,127.001 111.289,121.303 111.289,114.273 C 111.289,107.242 105.557,101.545 98.486,101.545 z "
-           style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
-        <path
-           id="path8440"
-           d="M 51.868,86.936 C 45.459,81.297 41.784,73.221 41.784,64.78 C 41.784,56.276 45.498,48.164 51.974,42.523 C 52.339,42.204 52.419,41.667 52.16,41.256 L 42.036,25.192 C 41.888,24.958 41.648,24.796 41.375,24.748 C 41.102,24.7 40.819,24.769 40.602,24.937 C 32.334,31.305 26.119,40.265 23.1,50.167 C 22.982,50.554 23.112,50.974 23.431,51.226 C 27.586,54.517 30.066,59.583 30.066,64.779 C 30.066,69.975 27.585,75.043 23.429,78.334 C 23.112,78.585 22.98,79.004 23.098,79.392 C 26.093,89.211 32.238,98.12 40.404,104.474 C 40.623,104.645 40.903,104.715 41.177,104.667 C 41.45,104.62 41.691,104.459 41.84,104.226 L 52.049,88.204 C 52.309,87.794 52.232,87.256 51.868,86.936 z M 12.803,52.223 C 5.732,52.223 0,57.951 0,65.016 C 0,72.081 5.732,77.81 12.803,77.81 C 19.874,77.81 25.606,72.081 25.606,65.016 C 25.606,57.951 19.874,52.223 12.803,52.223 z M 58.779,37.162 C 59.036,37.57 59.551,37.732 59.996,37.545 C 63.75,35.958 67.65,35.153 71.586,35.153 C 86.064,35.153 98.693,45.887 100.963,60.122 C 101.039,60.6 101.451,60.951 101.934,60.951 L 121.014,60.98 C 121.292,60.98 121.557,60.863 121.744,60.657 C 121.931,60.451 122.021,60.178 121.995,59.9 C 120.967,49.338 116.471,39.15 109.336,31.215 C 109.014,30.855 108.477,30.783 108.07,31.046 C 105.193,32.904 101.925,33.888 98.623,33.888 C 88.99,33.888 81.154,26.098 81.153,16.524 C 81.154,16.519 81.172,16.158 81.172,16.142 C 81.172,15.665 80.829,15.254 80.356,15.172 C 77.344,14.65 74.394,14.284 71.586,14.284 C 63.875,14.284 56.084,16.221 49.054,19.695 C 48.804,19.819 48.618,20.043 48.543,20.311 C 48.467,20.579 48.509,20.866 48.657,21.102 L 58.779,37.162 z M 98,29.5 C 104.908,29.5 110.51,23.902 110.51,17 C 110.51,10.096 104.908,4.5 98,4.5 C 91.092,4.5 85.49,10.096 85.49,17 C 85.49,23.902 91.092,29.5 98,29.5 z M 120.994,68.733 L 101.916,68.795 C 101.435,68.796 101.024,69.147 100.947,69.621 C 98.646,83.75 86.024,94.405 71.586,94.405 C 67.604,94.405 63.66,93.581 59.864,91.955 C 59.42,91.766 58.906,91.925 58.645,92.33 L 48.442,108.345 C 48.293,108.58 48.25,108.867 48.324,109.136 C 48.398,109.404 48.583,109.629 48.832,109.753 C 55.917,113.3 63.786,115.174 71.586,115.174 C 74.479,115.174 77.492,114.901 80.541,114.36 C 80.969,114.285 81.297,113.936 81.348,113.505 C 82.364,104.73 89.791,98.112 98.623,98.112 C 101.361,98.112 104.147,98.81 106.679,100.13 C 107.064,100.331 107.533,100.257 107.838,99.946 C 115.823,91.803 120.846,81.104 121.978,69.817 C 122.006,69.54 121.915,69.264 121.727,69.057 C 121.539,68.85 121.272,68.732 120.994,68.733 z M 98.486,102.545 C 91.415,102.545 85.682,108.242 85.682,115.273 C 85.682,122.302 91.414,128.001 98.486,128.001 C 105.556,128.001 111.289,122.303 111.289,115.273 C 111.289,108.242 105.557,102.545 98.486,102.545 z "
-           style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
-        <path
-           id="path8442"
-           d="M 40.602,21.938 C 32.334,28.306 26.119,37.266 23.1,47.168 C 22.982,47.555 23.112,47.975 23.431,48.227 C 27.586,51.518 30.066,56.584 30.066,61.78 C 30.066,66.976 27.585,72.044 23.429,75.335 C 23.112,75.586 22.98,76.005 23.098,76.393 C 26.093,86.212 32.238,95.121 40.404,101.475 C 40.623,101.646 40.903,101.716 41.177,101.668 C 41.45,101.621 41.691,101.46 41.84,101.227 L 52.049,85.205 C 52.31,84.796 52.234,84.258 51.869,83.937 C 45.46,78.298 41.785,70.222 41.785,61.781 C 41.785,53.277 45.499,45.165 51.975,39.524 C 52.34,39.205 52.42,38.668 52.161,38.257 L 42.036,22.192 C 41.888,21.958 41.648,21.796 41.375,21.748 C 41.102,21.7 40.819,21.769 40.602,21.938 z "
-           style="fill:#f97a00" />
-        <path
-           id="path8444"
-           d="M 24.042,47.455 C 28.431,50.932 31.051,56.219 31.051,61.779 C 31.051,67.339 28.43,72.628 24.04,76.104 C 26.991,85.785 32.981,94.45 41.008,100.697 C 42.028,99.097 50.449,85.879 51.217,84.674 C 44.602,78.854 40.799,70.574 40.799,61.779 C 40.799,52.92 44.642,44.603 51.327,38.78 C 50.565,37.572 42.215,24.322 41.203,22.717 C 33.076,28.978 27.018,37.694 24.042,47.455 z "
-           style="fill:#fb8b00" />
-        <ellipse
-           id="ellipse8446"
-           ry="12.794"
-           rx="12.803"
-           cy="62.015999"
-           cx="12.803"
-           style="fill:#f83011;fill-rule:evenodd"
-           sodipodi:cx="12.803"
-           sodipodi:cy="62.015999"
-           sodipodi:rx="12.803"
-           sodipodi:ry="12.794" />
-        <path
-           id="path8448"
-           d="M 0.984,62.016 C 0.984,68.528 6.286,73.827 12.802,73.827 C 19.318,73.827 24.62,68.528 24.62,62.016 C 24.62,55.504 19.318,50.206 12.802,50.206 C 6.286,50.206 0.984,55.504 0.984,62.016 z "
-           style="fill:#f83011;fill-rule:evenodd" />
-        <path
-           id="path8450"
-           d="M 49.054,16.696 C 48.804,16.82 48.618,17.044 48.543,17.312 C 48.467,17.58 48.509,17.867 48.657,18.103 L 58.779,34.162 C 59.036,34.57 59.551,34.732 59.996,34.545 C 63.75,32.958 67.65,32.153 71.586,32.153 C 86.064,32.153 98.693,42.887 100.963,57.122 C 101.039,57.6 101.451,57.951 101.934,57.951 L 121.014,57.98 C 121.292,57.98 121.557,57.863 121.744,57.657 C 121.931,57.451 122.021,57.178 121.995,56.9 C 120.967,46.338 116.471,36.15 109.336,28.215 C 109.014,27.855 108.477,27.783 108.07,28.046 C 105.193,29.904 101.925,30.888 98.623,30.888 C 88.99,30.888 81.154,23.098 81.153,13.524 C 81.154,13.519 81.172,13.158 81.172,13.142 C 81.172,12.665 80.829,12.254 80.356,12.172 C 77.344,11.65 74.394,11.284 71.586,11.284 C 63.875,11.285 56.084,13.222 49.054,16.696 z "
-           style="fill:#f13b00" />
-        <path
-           id="path8452"
-           d="M 49.491,17.578 C 50.527,19.223 58.856,32.437 59.613,33.639 C 63.439,32.022 67.458,31.17 71.587,31.17 C 86.704,31.17 99.583,42.205 101.937,56.968 C 103.373,56.97 119.109,56.993 121.017,56.996 C 120.004,46.605 115.636,36.693 108.606,28.873 C 105.609,30.81 102.191,31.872 98.625,31.872 C 88.449,31.872 80.17,23.641 80.17,13.523 C 80.17,13.523 80.18,13.313 80.189,13.142 C 77.356,12.65 74.471,12.268 71.588,12.268 C 63.928,12.269 56.327,14.199 49.491,17.578 z "
-           style="fill:#f13b00" />
-        <ellipse
-           id="ellipse8454"
-           ry="12.5"
-           rx="12.51"
-           cy="14"
-           cx="98"
-           style="fill:#e00916;fill-rule:evenodd"
-           sodipodi:cx="98"
-           sodipodi:cy="14"
-           sodipodi:rx="12.51"
-           sodipodi:ry="12.5" />
-        <path
-           id="path8456"
-           d="M 86.992,14 C 86.992,20.065 91.93,25 98,25 C 104.07,25 109.008,20.065 109.008,14 C 109.008,7.935 104.07,3 98,3 C 91.93,3 86.992,7.935 86.992,14 z "
-           style="fill:#e56363;fill-rule:evenodd" />
-        <path
-           id="path8458"
-           d="M 120.994,65.733 L 101.916,65.795 C 101.435,65.796 101.024,66.147 100.947,66.621 C 98.646,80.75 86.024,91.405 71.586,91.405 C 67.604,91.405 63.66,90.581 59.864,88.955 C 59.42,88.766 58.906,88.925 58.645,89.33 L 48.442,105.345 C 48.293,105.58 48.25,105.867 48.324,106.136 C 48.398,106.404 48.583,106.629 48.832,106.753 C 55.917,110.3 63.786,112.174 71.586,112.174 C 74.479,112.174 77.492,111.901 80.541,111.36 C 80.969,111.285 81.297,110.936 81.348,110.505 C 82.364,101.73 89.791,95.112 98.623,95.112 C 101.361,95.112 104.147,95.81 106.679,97.13 C 107.064,97.331 107.533,97.257 107.838,96.946 C 115.823,88.803 120.846,78.104 121.978,66.817 C 122.006,66.54 121.915,66.264 121.727,66.057 C 121.539,65.85 121.272,65.732 120.994,65.733 z "
-           style="fill:#d40000" />
-        <ellipse
-           id="ellipse8460"
-           ry="12.728"
-           rx="12.803"
-           cy="112.272"
-           cx="98.486"
-           style="fill:#ff7516;fill-rule:evenodd"
-           sodipodi:cx="98.486"
-           sodipodi:cy="112.272"
-           sodipodi:rx="12.803"
-           sodipodi:ry="12.728" />
-        <path
-           id="path8462"
-           d="M 86.844,112.272 C 86.844,118.651 92.067,123.841 98.487,123.841 C 104.907,123.841 110.13,118.651 110.13,112.272 C 110.13,105.893 104.907,100.703 98.487,100.703 C 92.067,100.703 86.844,105.894 86.844,112.272 z "
-           style="fill:#fb9200;fill-rule:evenodd" />
-        <path
-           id="path8464"
-           d="M 49.785,17.67 C 50.008,18.024 59.527,33.127 59.695,33.395 C 63.548,31.791 67.547,30.969 71.586,30.969 C 78.265,30.969 84.635,33.086 90.02,37.08 C 90.155,37.07 103.667,36.099 103.667,36.099 C 103.667,36.099 112.654,35.447 113.294,35.4 C 111.865,33.167 110.392,31.264 108.67,29.337 C 105.639,31.256 102.097,32.173 98.623,32.173 C 88.337,32.173 79.969,23.752 79.969,13.525 C 79.969,13.519 79.973,13.418 79.979,13.318 C 77.094,12.827 74.27,12.47 71.586,12.47 C 64.13,12.469 56.6,14.34 49.785,17.67 z "
-           style="fill:url(#linearGradient8470);fill-rule:evenodd" />
-        <path
-           id="path8466"
-           d="M 24.274,47.396 C 26.599,49.268 28.451,51.682 29.658,54.398 C 34.14,51.488 38.459,49.95 43.889,47.772 C 45.598,44.761 48.481,41.04 51.074,38.755 C 50.915,38.503 41.39,23.39 41.155,23.017 C 33.202,29.201 27.214,37.844 24.274,47.396 z "
-           style="fill:url(#linearGradient8472);fill-rule:evenodd" />
-        <path
-           id="path8468"
-           d="M 23.732,58.691 C 22.313,53.996 17.948,50.566 12.794,50.566 C 6.493,50.566 1.367,55.689 1.367,61.985 C 1.367,66.015 3.469,69.565 6.633,71.597 C 11.926,67.035 17.919,62.755 23.732,58.691 z "
-           style="fill:#f88657;fill-rule:evenodd" />
-      </g>
-    </mask>
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="627"
-     inkscape:window-width="910"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="7.2055766"
-     inkscape:cx="35.602016"
-     inkscape:cy="22.962506"
-     inkscape:window-x="238"
-     inkscape:window-y="96"
-     inkscape:current-layer="svg2254"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="0"
-       id="guide4273" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="48"
-       id="guide4275" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="0"
-       id="guide4437" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="48"
-       id="guide4439" />
-  </sodipodi:namedview>
-  <rect
-     style="fill:url(#linearGradient4371);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="rect4011"
-     width="47.866001"
-     height="47.866001"
-     x="-48"
-     y="-47.866001"
-     transform="scale(-1,-1)"
-     inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-bulb.png"
-     inkscape:export-xdpi="90"
-     inkscape:export-ydpi="90" />
-  <rect
-     style="fill:url(#linearGradient4368);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="rect3016"
-     width="45.866379"
-     height="45.866383"
-     x="1.1343775"
-     y="1.048512" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path4033"
-     sodipodi:cx="-30.021633"
-     sodipodi:cy="23.982693"
-     sodipodi:rx="20.014421"
-     sodipodi:ry="20.014421"
-     d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-     transform="translate(53.070541,-2.5560054e-2)" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:1;fill:url(#linearGradient4041);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path4031"
-     sodipodi:cx="-30.021633"
-     sodipodi:cy="23.982693"
-     sodipodi:rx="20.014421"
-     sodipodi:ry="20.014421"
-     d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-     transform="translate(55.071984,-2.5560054e-2)" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:1;fill:#fffffa;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4267)"
-     id="path4043"
-     sodipodi:cx="-38.944729"
-     sodipodi:cy="15.643351"
-     sodipodi:rx="8.9230967"
-     sodipodi:ry="8.8397036"
-     d="M -30.021632 15.643351 A 8.9230967 8.8397036 0 1 1  -47.867826,15.643351 A 8.9230967 8.8397036 0 1 1  -30.021632 15.643351 z"
-     transform="matrix(1.2616822,0,0,1.1226415,62.529072,-5.2595765)"
-     mask="url(#mask4181)" />
-  <g
-     id="g4417"
-     clip-path="url(#clipPath4423)"
-     transform="translate(50.116184,2.1870546e-2)">
-    <path
-       transform="translate(1.387814,-0.4734046)"
-       clip-path="none"
-       id="path4279"
-       d="M -47.32329,19.312662 L -6.0456207,19.312662"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4429);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       transform="translate(1.387814,-0.4734046)"
-       clip-path="none"
-       id="path4281"
-       d="M -47.32329,22.48125 L -6.045621,22.48125"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4431);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       transform="translate(1.387814,-0.4734046)"
-       clip-path="none"
-       id="path4283"
-       d="M -47.32329,25.482334 L -6.0456207,25.482334"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4433);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       transform="translate(1.387814,-0.4734046)"
-       clip-path="none"
-       id="path4285"
-       d="M -47.32329,28.481612 L -6.0456207,28.481612"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4435);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD
deleted file mode 100644
index 551e20c50..000000000
--- a/testing/ekiga/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169549 2012-10-23 12:35:22Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=ekiga
-pkgver=3.9.90
-pkgrel=1
-pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
-url="http://www.ekiga.org"
-license=(GPL)
-arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
-optdepends=('evolution-data-server: Evolution integration')
-options=(!emptydirs)
-groups=('gnome-extra')
-install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d905169c257173196d235bad6501682cd07752a6a29577620cc4dfb91d8b77a9')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-install \
-      --disable-scrollkeeper --enable-dbus
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install
deleted file mode 100644
index 91f3a57a0..000000000
--- a/testing/ekiga/ekiga.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ekiga
-
-post_install() {
-  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() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/testing/ekiga/gcc47.patch b/testing/ekiga/gcc47.patch
deleted file mode 100644
index f12c37524..000000000
--- a/testing/ekiga/gcc47.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
-From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
-Date: Sat, 24 Mar 2012 09:17:40 +0000
-Subject: Fix compile error with gcc 4.7
-
----
-diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
-index e16848e..b0a8775 100644
---- a/lib/engine/account/bank-impl.h
-+++ b/lib/engine/account/bank-impl.h
-@@ -203,7 +203,7 @@ template<typename AccountType>
- void
- Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
- {
--  add_object (account);
-+  this->add_object (account);
- 
-   account->questions.connect (boost::ref (questions));
- }
-@@ -213,7 +213,7 @@ template<typename AccountType>
- void
- Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
- {
--  remove_object (account);
-+  this->remove_object (account);
- }
- 
- #endif
-diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
-index 711d8d9..4fea7d5 100644
---- a/lib/engine/addressbook/book-impl.h
-+++ b/lib/engine/addressbook/book-impl.h
-@@ -204,7 +204,7 @@ void
- Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
- {
-   contact->questions.connect (boost::ref (questions));
--  add_object (contact);
-+  this->add_object (contact);
- }
- 
- 
-@@ -212,7 +212,7 @@ template<typename ContactType>
- void
- Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
- {
--  remove_object (contact);
-+  this->remove_object (contact);
- }
- 
- #endif
-diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
-index a30cd03..630236f 100644
---- a/lib/engine/addressbook/source-impl.h
-+++ b/lib/engine/addressbook/source-impl.h
-@@ -206,7 +206,7 @@ template<typename BookType>
- void
- Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
- {
--  add_object (book);
-+  this->add_object (book);
- 
-   add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
- 
-diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
-index 245a7c6..92074a8 100644
---- a/lib/engine/presence/cluster-impl.h
-+++ b/lib/engine/presence/cluster-impl.h
-@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
- 
-   add_connection (heap, heap->questions.connect (boost::ref (questions)));
- 
--  add_object (heap);
-+  this->add_object (heap);
- }
- 
- template<typename HeapType>
-diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
-index d63c491..15fe86f 100644
---- a/lib/engine/presence/heap-impl.h
-+++ b/lib/engine/presence/heap-impl.h
-@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
- {
-   presentity->questions.connect (boost::ref (questions));
- 
--  add_object (presentity);
-+  this->add_object (presentity);
- }
- 
- template<typename PresentityType>
- void
- Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
- {
--  remove_object (presentity);
-+  this->remove_object (presentity);
- }
- 
- #endif
---
-cgit v0.9.0.2
diff --git a/testing/elfutils/PKGBUILD b/testing/elfutils/PKGBUILD
deleted file mode 100644
index d368534a4..000000000
--- a/testing/elfutils/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 166408 2012-09-07 16:52:26Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
-
-pkgname=elfutils
-pkgver=0.155
-pkgrel=1
-pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/elfutils/"
-license=('LGPL3' 'GPL' 'GPL3')
-depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
-provides=('libelf')
-replaces=('libelf')
-conflicts=('libelf')
-options=('!makeflags')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
-        elfutils-0.155-binutils-pr-ld-13621.patch)
-sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b'
-          'fcd0ebd029b305bf030983daf151a2a1ab5294af'
-          '8a8be7c0686c6311c1ce969ba10494e704ead48c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CFLAGS+=" -g"  # required for test-suite success
-  patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch
-  ./configure --prefix=/usr --program-prefix="eu-"
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch b/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
deleted file mode 100644
index 7f99ac0be..000000000
--- a/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
-index 4b01008..7a5f0c8 100755
---- a/tests/run-elflint-self.sh
-+++ b/tests/run-elflint-self.sh
-@@ -18,4 +18,11 @@
- 
- . $srcdir/test-subr.sh
- 
-+# Makes sure we exit cleanly even when we don't...
-+clean_exit()
-+{
-+  if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi
-+}
-+trap clean_exit EXIT
-+
- testrun_on_self ../src/elflint --quiet --gnu-ld
diff --git a/testing/emacs/PKGBUILD b/testing/emacs/PKGBUILD
deleted file mode 100644
index a31a7259a..000000000
--- a/testing/emacs/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 169633 2012-10-25 01:34:57Z eric $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
-
-pkgname=emacs
-pkgver=24.2
-pkgrel=2
-pkgdesc="The extensible, customizable, self-documenting real-time display editor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/emacs/emacs.html"
-license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
-install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
-
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # remove conflict with ctags package
-  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
-  # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
-  # fix perms on /var/games
-  chmod 775 "$pkgdir"/var/games
-  chmod 775 "$pkgdir"/var/games/emacs
-  chmod 664 "$pkgdir"/var/games/emacs/*
-  chown -R root:games "$pkgdir"/var/games
-}
diff --git a/testing/emacs/emacs.install b/testing/emacs/emacs.install
deleted file mode 100644
index d84f1de14..000000000
--- a/testing/emacs/emacs.install
+++ /dev/null
@@ -1,32 +0,0 @@
-ICON_PATH=usr/share/icons/hicolor
-INFO_DIR=usr/share/info
-
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
-org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -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() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -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/empathy/PKGBUILD b/testing/empathy/PKGBUILD
deleted file mode 100644
index 3e619e29b..000000000
--- a/testing/empathy/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 169460 2012-10-21 14:03:14Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=empathy
-pkgver=3.6.1
-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=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-rakia: SIP support'
-            'telepathy-haze: libpurple support'
-            'nautilus-sendto: Send files from nautilus')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('12d936a39182500da7541bdd42327949c241b454fde462be52d137aae3c56183')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-schemas-compile \
-      --enable-gst-1.0=yes
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install
deleted file mode 100644
index f8d2dfb1f..000000000
--- a/testing/empathy/empathy.install
+++ /dev/null
@@ -1,16 +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
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    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() {
-    post_upgrade
-}
diff --git a/testing/enblend-enfuse/PKGBUILD b/testing/enblend-enfuse/PKGBUILD
deleted file mode 100644
index 0f3dd0551..000000000
--- a/testing/enblend-enfuse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169634 2012-10-25 01:34:59Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=8
-pkgdesc="Intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
-makedepends=('boost' 'mesa')
-replaces=('enblend')
-conflicts=('enblend')
-provides=('enblend')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \
-        libpng-1.4.patch enblend-4.0-libpng15.patch)
-sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
-          'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
-          'eae6cf48ea082865130302d0b4d1ca0b884a563b'
-          '71e961d90be842eafe9d473d8d70b04b29077036')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
-  patch -p1 -i ../libpng-1.4.patch
-  patch -p0 -i ../enblend-4.0-libpng15.patch
-  LIBS="-lboost_system" ./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-4.0-libpng15.patch b/testing/enblend-enfuse/enblend-4.0-libpng15.patch
deleted file mode 100644
index d4465ccad..000000000
--- a/testing/enblend-enfuse/enblend-4.0-libpng15.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -81,7 +81,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
-     png_error_message = std::string(error_msg);
--    longjmp( png_ptr->jmpbuf, 1 );
-+    longjmp( png_jmpbuf( png_ptr ), 1 );
- }
- 
- // called on non-fatal errors
-@@ -213,7 +213,7 @@
-         vigra_postcondition( png != 0, "could not create the read struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
-         }
-@@ -221,14 +221,14 @@
-         vigra_postcondition( info != 0, "could not create the info struct." );
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-         png_init_io( png, file.get() );
- 
-         // specify that the signature was already read
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
-         }
-@@ -244,13 +244,13 @@
-     void PngDecoderImpl::init()
-     {
-         // read all chunks up to the image data
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
-         png_read_info( png, info );
- 
-         // pull over the header fields
-         int interlace_method, compression_method, filter_method;
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
-         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
-                       &interlace_method, &compression_method, &filter_method );
-@@ -264,7 +264,7 @@
- 
-         // transform palette to rgb
-         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
-             png_set_palette_to_rgb(png);
-             color_type = PNG_COLOR_TYPE_RGB;
-@@ -273,7 +273,7 @@
- 
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( 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;
-@@ -283,7 +283,7 @@
- #if 0
-         // strip alpha channel
-         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
-             png_set_strip_alpha(png);
-             color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -323,12 +323,12 @@
- 
-         // read icc profile
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
--        char * dummyName;
-+        png_charpp dummyName;
-         int dummyCompType;
--        char * profilePtr;
-+        png_bytepp profilePtr;
-         png_uint_32 profileLen;
--        if (info->valid & PNG_INFO_iCCP) {
--            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-+        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
-+            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
-             iccProfilePtr = (unsigned char *) profilePtr;
-             iccProfileLength = profileLen;
-         }
-@@ -340,7 +340,7 @@
-         // image gamma
-         double image_gamma = 0.45455;
-         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
-             png_get_gAMA( png, info, &image_gamma );
-         }
-@@ -349,26 +349,26 @@
-         double screen_gamma = 2.2;
- 
-         // set gamma correction
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
-         png_set_gamma( png, screen_gamma, image_gamma );
- #endif
- 
-         // interlace handling, get number of read passes needed
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
-         n_interlace_passes = png_set_interlace_handling(png);
- 
-         // update png library state to reflect any changes that were made
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
-         png_read_update_info( png, info );
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
-         n_channels = png_get_channels(png, info);
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
-         rowsize = png_get_rowbytes(png, info);
- 
-@@ -379,7 +379,7 @@
-     void PngDecoderImpl::nextScanline()
-     {
-         for (int i=0; i < n_interlace_passes; i++) {
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-             png_read_row(png, row_data.begin(), NULL);
-         }
-@@ -545,7 +545,7 @@
-         vigra_postcondition( png != 0, "could not create the write struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
-         }
-@@ -556,7 +556,7 @@
-         }
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-@@ -571,7 +571,7 @@
-     void PngEncoderImpl::finalize()
-     {
-         // write the IHDR
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
-         png_set_IHDR( png, info, width, height, bit_depth, color_type,
-                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -579,7 +579,7 @@
- 
-         // set resolution
-         if (x_resolution > 0 && y_resolution > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -588,7 +588,7 @@
- 
-         // set offset
-         if (position.x > 0 && position.y > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
-             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
-         }
-@@ -597,12 +597,12 @@
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, "icc", 0,
--                         (char *)iccProfile.begin(), iccProfile.size());
-+                         iccProfile.begin(), iccProfile.size());
-         }
- #endif
- 
-         // write the info struct
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
-         png_write_info( png, info );
- 
-@@ -634,10 +634,10 @@
-         }
- 
-         // write the whole image
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
-         png_write_image( png, row_pointers.begin() );
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
-         png_write_end(png, info);
-     }
diff --git a/testing/enblend-enfuse/enblend-enfuse.install b/testing/enblend-enfuse/enblend-enfuse.install
deleted file mode 100644
index 24ea28a4e..000000000
--- a/testing/enblend-enfuse/enblend-enfuse.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist=(enblend.info enfuse.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
-}
-
-# 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 3b9071fd2..000000000
--- a/testing/eog-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169261 2012-10-18 19:28:57Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=eog-plugins
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Plugins for Eye of Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/"
-license=('GPL2')
-depends=('eog' 'libchamplain' '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=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $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 eed12259c..000000000
--- a/testing/eog/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169260 2012-10-18 19:28:54Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=eog
-pkgver=3.6.1
-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' 'itstool')
-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=('4442ec61b0c5092c686ccd13038359eb50e48ee49176a588b8ea04072c19bd57')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$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 1571179ca..000000000
--- a/testing/eog/eog.install
+++ /dev/null
@@ -1,13 +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
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/epiphany-extensions/PKGBUILD b/testing/epiphany-extensions/PKGBUILD
deleted file mode 100644
index 3dc63bab9..000000000
--- a/testing/epiphany-extensions/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169258 2012-10-18 19:28:46Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany-extensions
-pkgver=3.6.0
-pkgrel=1
-url="http://www.gnome.org/projects/epiphany/"
-pkgdesc="Various extentions for the Epiphany web browser"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('epiphany' 'opensp' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=epiphany-extensions.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a1cc21b44a7b00cfe055b87c23f20f16c9fbd2b5a30380338885a5ae0847f7a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/epiphany-extensions/epiphany-extensions.install b/testing/epiphany-extensions/epiphany-extensions.install
deleted file mode 100644
index c0ed9a0d7..000000000
--- a/testing/epiphany-extensions/epiphany-extensions.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/epiphany/PKGBUILD b/testing/epiphany/PKGBUILD
deleted file mode 100644
index e44998d06..000000000
--- a/testing/epiphany/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169259 2012-10-18 19:28:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany
-pkgver=3.6.1
-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' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme' 'gcr' 'gnome-desktop')
-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:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/epiphany/epiphany.install b/testing/epiphany/epiphany.install
deleted file mode 100644
index 8b17fa3d4..000000000
--- a/testing/epiphany/epiphany.install
+++ /dev/null
@@ -1,13 +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
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/ethtool/PKGBUILD b/testing/ethtool/PKGBUILD
deleted file mode 100644
index f019057d5..000000000
--- a/testing/ethtool/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 165198 2012-08-12 20:15:37Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Contributor: Martin Kemp <mdkemp@elys.com>
-
-pkgname=ethtool
-pkgver=3.5
-pkgrel=1
-epoch=1
-pkgdesc="Utility for controlling network drivers and hardware"
-arch=('i686' 'x86_64')
-url="http://www.kernel.org/pub/software/network/ethtool/"
-license=('GPL')
-depends=('glibc')
-source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('021b5785f65637a04d65c2d44d6c2250')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --mandir=/usr/share/man
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD
deleted file mode 100644
index 98d1f5674..000000000
--- a/testing/evince/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169538 2012-10-23 11:07:56Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl')
-optdepends=('texlive-bin: DVI support'
-	    'gvfs: bookmark support and session saving')
-groups=('gnome-extra')
-install=evince.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b87b2579d438a126391f9044611b472e9f7b5b712e40b5645b0810164bc41b5')
-
-build() {
-  cd "$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 "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evince/evince.install b/testing/evince/evince.install
deleted file mode 100644
index 1571179ca..000000000
--- a/testing/evince/evince.install
+++ /dev/null
@@ -1,13 +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
-}
-
-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 45fee9741..000000000
--- a/testing/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169256 2012-10-18 19:28:39Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
-options=('!libtool')
-install=$pkgname.install
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('637fcb6a83601af2968ca0b600958da8b0f25444224edc5fae41dea995924150')
-
-build() {
-  cd "$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 "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evolution-data-server/evolution-data-server.install b/testing/evolution-data-server/evolution-data-server.install
deleted file mode 100644
index 29a359805..000000000
--- a/testing/evolution-data-server/evolution-data-server.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove () {
-    post_install
-}
diff --git a/testing/evolution-ews/PKGBUILD b/testing/evolution-ews/PKGBUILD
deleted file mode 100644
index de2a41619..000000000
--- a/testing/evolution-ews/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169254 2012-10-18 19:28:32Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=evolution-ews
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="MS Exchange integration through Exchange Web Services"
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-url="http://www.gnome.org"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a1d40971f47bfd947349f48a86f8a5ec7252db41b9b0d19204b4e28f2408a96a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD
deleted file mode 100644
index cc34dc7bd..000000000
--- a/testing/evolution/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 169383 2012-10-20 09:13:48Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Manage your email, contacts and schedule"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'itstool' 'docbook-xsl' '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:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7aa0730d6815cc44dbde75b4464697dd9d51584f48e9e03e86c2e5ca5a97a521')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --enable-nss=yes \
-      --with-openldap=yes \
-      --enable-smime=yes \
-      --with-krb5=/usr \
-      --disable-schemas-compile
-  
-  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 $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install
deleted file mode 100644
index 67eca41f0..000000000
--- a/testing/evolution/evolution.install
+++ /dev/null
@@ -1,19 +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/evolution.schemas ]; then
-    gconfpkg --uninstall evolution
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/exiv2/PKGBUILD b/testing/exiv2/PKGBUILD
deleted file mode 100644
index 0d5a550d2..000000000
--- a/testing/exiv2/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-#$Id: PKGBUILD 164674 2012-08-02 15:21:12Z andrea $
-# Maintainer: tobias <tobias@arhlinux.org>
-
-pkgname=exiv2
-pkgver=0.23
-pkgrel=1
-pkgdesc="Exif and Iptc metadata manipulation library and tools"
-arch=('i686' 'x86_64')
-url="http://exiv2.org"
-license=('GPL')
-depends=('gcc-libs' 'zlib' 'expat')
-options=('!libtool')
-source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5f342bf642477526f41add11d6ee7787cdcd639f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/farstream/PKGBUILD b/testing/farstream/PKGBUILD
deleted file mode 100644
index de76e2a49..000000000
--- a/testing/farstream/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169253 2012-10-18 19:28:28Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=farstream
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/Farstream"
-license=('LGPL2.1')
-depends=('gst-plugins-base-libs' 'libnice')
-makedepends=('gobject-introspection')
-optdepends=('gst-plugins-good' 'gst-plugins-bad')
-conflicts=('farsight2')
-replaces=('farsight2')
-options=(!libtool)
-source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('479c42adf5cc606abcb47d58ed542414')
-
-build() {
-  cd  "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --with-package-name='Arch Linux farstream package' \
-    --with-package-origin='http://archlinux.org' \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/fetchmail/PKGBUILD b/testing/fetchmail/PKGBUILD
deleted file mode 100644
index f4045b5c2..000000000
--- a/testing/fetchmail/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 165877 2012-09-02 12:54:03Z pierre $
-
-pkgname=fetchmail
-pkgver=6.3.22
-pkgrel=1
-pkgdesc="A remote-mail retrieval utility"
-arch=('i686' 'x86_64')
-url="http://fetchmail.berlios.de/"
-license=('GPL')
-depends=('openssl')
-makedepends=('python2')
-optdepends=('tk: for using fetchmailconf'
-            'python2: for using fetchmailconf')
-backup=('etc/conf.d/fetchmail')
-options=('!makeflags')
-install='fetchmail.install'
-source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc"
-        'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
-sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19'
-          '27184b75ef09c5202bede9863ae8abc3d0cdb1d2'
-          'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
-          '30401729386d6f774c6c36ab8530842166de54a8'
-          '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
-          '11ff81fc8363a54099880da18634b0d1ecf9fa82')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
-  PYTHON=python2 ./configure --prefix=/usr --with-ssl=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
-  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
-  install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
-  install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf
-  install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service
-}
diff --git a/testing/fetchmail/fetchmail.conf b/testing/fetchmail/fetchmail.conf
deleted file mode 100644
index dcac2a067..000000000
--- a/testing/fetchmail/fetchmail.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Daemon polling interval
-INTERVAL=60
-
-# Config location
-CONFIG=/etc/fetchmailrc
diff --git a/testing/fetchmail/fetchmail.install b/testing/fetchmail/fetchmail.install
deleted file mode 100644
index 81b374c57..000000000
--- a/testing/fetchmail/fetchmail.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  # /etc/fetchmail must be owned by fetchmail for daemon to work.
-  echo "If you run fetchmail as a daemon and not a cron job"
-  echo "then 'chown fetchmail /etc/fetchmailrc'"
-  getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
-  if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
-  fi
-}
-
-post_upgrade() {
-  getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
-
-  if [ "$(vercmp $2 6.3.19-3)" -lt 0 ] ; then
-    usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
-  fi
-  if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
-  fi
-}
-
-pre_remove() {
-  usr/sbin/userdel fetchmail &>/dev/null
-}
diff --git a/testing/fetchmail/fetchmail.rc b/testing/fetchmail/fetchmail.rc
deleted file mode 100644
index 4d8b98d40..000000000
--- a/testing/fetchmail/fetchmail.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/fetchmail
-
-PID=`pidof -o %PPID /usr/bin/fetchmail`
-case "$1" in
-  start)
-    stat_busy "Starting fetchmail"
-    [ -z "$PID" ] &&
-      su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fetchmail
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fetchmail"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fetchmail
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/fetchmail/fetchmail.service b/testing/fetchmail/fetchmail.service
deleted file mode 100644
index 3e7da7545..000000000
--- a/testing/fetchmail/fetchmail.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=A remote-mail retrieval utility
-After=network.target
-
-[Service]
-User=fetchmail
-EnvironmentFile=/etc/conf.d/fetchmail
-ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG}
-RestartSec=1
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/fetchmail/fetchmail.tmpfiles b/testing/fetchmail/fetchmail.tmpfiles
deleted file mode 100644
index 07945f876..000000000
--- a/testing/fetchmail/fetchmail.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/fetchmail 700 fetchmail nobody
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
deleted file mode 100644
index 265d45050..000000000
--- a/testing/ffmpeg/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 163055 2012-07-06 15:21:01Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg
-pkgver=0.11.1
-pkgrel=1
-epoch=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=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('ff8cb914f657e164dd60ea1008b555a8')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-libv4l2 \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --disable-static
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd $pkgname-$pkgver
-  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/ffmpegthumbnailer/PKGBUILD b/testing/ffmpegthumbnailer/PKGBUILD
deleted file mode 100644
index f9afaf39a..000000000
--- a/testing/ffmpegthumbnailer/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: boromil@gmail.com
-
-pkgname=ffmpegthumbnailer
-pkgver=2.0.7
-pkgrel=5
-pkgdesc="Lightweight video thumbnailer that can be used by file managers."
-url="http://code.google.com/p/ffmpegthumbnailer/"
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('ffmpeg' 'libjpeg' 'libpng')
-optdepends=('gvfs: support for gio uris')
-source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-        'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch')
-options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
-          '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Don't use deprecated (removed?) ffmpeg api
-  patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
-
-  ./configure --prefix=/usr --enable-gio
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # FS#24105: Generate thumbnails in nautilus
-  # FS#26540: Rename to .thumbnailer for nautilus
-  install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
-    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
-}
diff --git a/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
deleted file mode 100644
index 37e65b059..000000000
--- a/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libffmpegthumbnailer/moviedecoder.cpp.old	2012-05-20 11:57:04.503450287 +0200
-+++ libffmpegthumbnailer/moviedecoder.cpp	2012-05-20 11:57:14.633450566 +0200
-@@ -58,19 +58,26 @@
- void MovieDecoder::initialize(const string& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     string inputFile = filename == "-" ? "pipe:" : filename;
-     m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
--
-+    
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0)
-+#else
-+	if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
-+#endif
-     {
- 		destroy();
-         throw logic_error(string("Could not open input file: ") + filename);
-     }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if (av_find_stream_info(m_pFormatContext) < 0)
-+#else
-+	if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
-+#endif
-     {
- 		destroy();
-         throw logic_error(string("Could not find stream information"));
-@@ -90,8 +97,12 @@
- 
-     if ((!m_FormatContextWasGiven) && m_pFormatContext)
-     {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         av_close_input_file(m_pFormatContext);
-         m_pFormatContext = NULL;
-+#else
-+        avformat_close_input(&m_pFormatContext);
-+#endif
-     }
- 
-     if (m_pPacket)
-@@ -159,7 +170,11 @@
- 
-     m_pVideoCodecContext->workaround_bugs = 1;
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
-+#else
-+	if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
-+#endif
-     {
-         throw logic_error("Could not open video codec");
-     }
diff --git a/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop
deleted file mode 100644
index 79203e5bc..000000000
--- a/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=ffmpegthumbnailer
-Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10
-MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v;
diff --git a/testing/flex/PKGBUILD b/testing/flex/PKGBUILD
deleted file mode 100644
index 1c9e16129..000000000
--- a/testing/flex/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 164717 2012-08-04 01:16:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=flex
-pkgver=2.5.37
-pkgrel=1
-pkgdesc="A tool for generating text-scanning programs"
-arch=('i686' 'x86_64')
-url="http://flex.sourceforge.net"
-license=('custom')
-groups=('base-devel')
-depends=('glibc' 'm4' 'sh')
-install=flex.install
-source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
-        lex.sh)
-md5sums=('c75940e1fc25108f2a7b3ef42abdae06'
-         'f725259ec23a9e87ee29e2ef82eda9a5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  # these tests used features removed in bison-2.6
-  sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in
-
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-  install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
-
-  install -Dm644 COPYING \
-  	$pkgdir/usr/share/licenses/$pkgname/license.txt
-}
-
diff --git a/testing/flex/flex.install b/testing/flex/flex.install
deleted file mode 100644
index 5b328c722..000000000
--- a/testing/flex/flex.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(flex.info{,-1,-2})
-
-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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/flex/lex.sh b/testing/flex/lex.sh
deleted file mode 100644
index 13e7de692..000000000
--- a/testing/flex/lex.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/flex -l "$@"
diff --git a/testing/fluidsynth/PKGBUILD b/testing/fluidsynth/PKGBUILD
deleted file mode 100644
index 30569612a..000000000
--- a/testing/fluidsynth/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 166535 2012-09-09 20:43:05Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=fluidsynth
-pkgver=1.1.6
-pkgrel=1
-pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
-arch=('i686' 'x86_64')
-url="http://www.fluidsynth.org/"
-depends=('glib2' 'jack' 'dbus-core' 'libpulse')
-makedepends=('cmake' 'ladspa' 'doxygen')
-optdepends=('pulseaudio: PulseAudio sound support')
-license=('LGPL')
-backup=('etc/conf.d/fluidsynth')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'fluidsynth.conf'
-        'fluidsynth.rc'
-        'fluidsynth.systemd')
-md5sums=('ae5aca6de824b4173667cbd3a310b263'
-         '7d0ab0d75d4e87652f4cb7ffeac8a82b'
-         'b296dbfb524c2164f552f68bd9abe2ec'
-         'e0406748a154409907df62292be32e8a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_BUILD_TYPE=Release \
-          -Denable-ladspa=ON \
-          -DLIB_SUFFIX=""
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  install -Dm644 "$srcdir/fluidsynth.conf" \
-    "$pkgdir/etc/conf.d/fluidsynth"
-
-  install -Dm755 "$srcdir/fluidsynth.rc" \
-    "$pkgdir/etc/rc.d/fluidsynth"
-
-  install -Dm644 "$srcdir/fluidsynth.systemd" \
-    "$pkgdir/usr/lib/systemd/system/fluidsynth.service"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/fluidsynth/fluidsynth.conf b/testing/fluidsynth/fluidsynth.conf
deleted file mode 100644
index b8465fa2e..000000000
--- a/testing/fluidsynth/fluidsynth.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000"
-FSYNTH_SOUNDFONT="" # path to your soundfont
diff --git a/testing/fluidsynth/fluidsynth.install b/testing/fluidsynth/fluidsynth.install
deleted file mode 100644
index 86e05f892..000000000
--- a/testing/fluidsynth/fluidsynth.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-	echo
-	echo "  > To use FluidSynth as a daemon edit /etc/conf.d/fluidsynth"
-	echo
-	echo "  > Systemd users need to copy the service file from:"
-	echo "      /usr/lib/systemd/system/fluidsynth.service"
-	echo "  > to:"
-	echo "      /etc/systemd/system/multi-user.target.wants/"
-	echo "  > and then edit accordingly."
-	echo
-	echo "  > PulseAudio output when running as a daemon"
-	echo "  > is known to be problematic. See:"
-	echo "      https://bbs.archlinux.org/viewtopic.php?id=135092"
-	echo
-}
-
-post_upgrade() {
-	post_install
-}
diff --git a/testing/fluidsynth/fluidsynth.rc b/testing/fluidsynth/fluidsynth.rc
deleted file mode 100644
index ca1e8fa6e..000000000
--- a/testing/fluidsynth/fluidsynth.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth
-
-PID=`pidof -o %PPID /usr/bin/fluidsynth`
-case "$1" in
-   start)
-     stat_busy "Starting Fluidsynth soundfont synthesizer"
-     [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 &
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       echo $PID > /var/run/fluidsynth.pid
-       add_daemon fluidsynth
-       stat_done
-     fi
-     ;;
-   stop)
-     stat_busy "Stopping Fluidsynth soundfont synthesizer"
-     [ ! -z "$PID" ]  && kill $PID &> /dev/null 2>&1
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm /var/run/fluidsynth.pid
-       rm_daemon fluidsynth
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 1
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/fluidsynth/fluidsynth.systemd b/testing/fluidsynth/fluidsynth.systemd
deleted file mode 100644
index 06784fe05..000000000
--- a/testing/fluidsynth/fluidsynth.systemd
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=FluidSynth Daemon
-After=sound.target
-
-[Service]
-ExecStart=/usr/bin/fluidsynth -is -a alsa -m alsa_seq -r 48000 # append soundfont path here
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD
deleted file mode 100644
index c4099d927..000000000
--- a/testing/folks/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169251 2012-10-18 19:28:21Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=folks
-pkgver=0.8.0
-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' 'libzeitgeist')
-makedepends=('gobject-introspection' 'intltool')
-install=folks.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/folks/folks.install b/testing/folks/folks.install
deleted file mode 100644
index c19349f72..000000000
--- a/testing/folks/folks.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/fontconfig/29-replace-bitmap-fonts.conf b/testing/fontconfig/29-replace-bitmap-fonts.conf
deleted file mode 100644
index 7ac4483c4..000000000
--- a/testing/fontconfig/29-replace-bitmap-fonts.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-    <!-- Replace generic bitmap font names by generic font families.
-         These font-families will get replaced by other rules and
-	 default to scaled ones. -->
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Helvetica</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Arial</string>
-            <string>Liberation Sans</string>	    
-            <string>sans-serif</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Courier</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Courier New</string>
-            <string>Liberation Mono</string>
-            <string>monospace</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Times</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Times New Roman</string>
-            <string>Liberation Serif</string>
-            <string>serif</string>
-        </edit>
-    </match>
-</fontconfig>
diff --git a/testing/fontconfig/PKGBUILD b/testing/fontconfig/PKGBUILD
deleted file mode 100644
index ffa5f2544..000000000
--- a/testing/fontconfig/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 166194 2012-09-05 14:35:55Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=fontconfig
-pkgver=2.10.1
-pkgrel=2
-pkgdesc="A library for configuring and customizing font access"
-arch=(i686 x86_64)
-url="http://www.fontconfig.org/release/"
-license=('custom')
-depends=('expat' 'freetype2')
-options=('!libtool')
-install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
-        29-replace-bitmap-fonts.conf)
-md5sums=('c94e380eea42f2f23ca9537035ef1899'
-         'f6b67e8cc79197ed6abd4701911e83da')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
-  libtoolize -f
-  autoreconf -f
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-templatedir=/etc/fonts/conf.avail \
-    --with-xmldir=/etc/fonts \
-    --localstatedir=/var \
-    --disable-static \
-    --with-default-fonts=/usr/share/fonts \
-    --with-add-fonts=/usr/share/fonts
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # not upstream, not in FC and not in Gentoo, this should probably go upstream
-  # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back
-  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
-  pushd $pkgdir/etc/fonts/conf.d
-  ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf .
-  popd
-
-  #Install license
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/testing/fontconfig/fontconfig.install b/testing/fontconfig/fontconfig.install
deleted file mode 100644
index 3a0ca573b..000000000
--- a/testing/fontconfig/fontconfig.install
+++ /dev/null
@@ -1,39 +0,0 @@
-post_install() {
-  cat << _EOF
-  
-  Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d.
-  Read /etc/fonts/conf.d/README for more information.
-
-  Configuration via /etc/fonts/local.conf is still possible,
-  but is no longer recommended for options available in conf.avail.
-
-  Main systemwide configuration should be done by symlinks
-  (especially for autohinting, sub-pixel and lcdfilter):
-  
-  cd /etc/fonts/conf.d
-  ln -s ../conf.avail/XX-foo.conf
-  
-  Check also https://wiki.archlinux.org/index.php/Font_Configuration
-  and https://wiki.archlinux.org/index.php/Fonts.
-
-_EOF
-
-  echo -n "updating font cache... "
-  /usr/bin/fc-cache -f
-  echo "done."
-}
-
-post_upgrade() {
-  echo -n "updating font cache... "
-  /usr/bin/fc-cache -f
-  echo "done."
-}
-
-post_remove() {
-  cat << _EOF
-
-  Check for dead symlinks and leftover files 
-  in /etc/fonts/conf.d/
-  
-_EOF
-}
diff --git a/testing/fssos-nsvs/PKGBUILD b/testing/fssos-nsvs/PKGBUILD
deleted file mode 100644
index aca81ddc4..000000000
--- a/testing/fssos-nsvs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167185 2012-09-26 22:19:44Z tomegun $
-# Maintainer: Dale Blount <dale@archlinux.org>
-
-pkgname=fssos-nsvs
-pkgver=0.5
-pkgrel=9
-pkgdesc="NSVS for FSSOS"
-arch=('i686' 'x86_64')
-url="http://fssos.sourceforge.net/"
-license=('GPL')
-depends=('bash' 'mysql')
-backup=('etc/nsvsd.conf')
-options=('!libtool' '!makeflags')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz"
-        'nsvsd'
-	'nsvsd.service')
-
-build() {
-  cd $srcdir/nsvs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-}
-
-package() {
-  cd $srcdir/nsvs-$pkgver
-  make DESTDIR=$pkgdir install
-  install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd"
-  install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service"
-}
-md5sums=('3f17c2f6339f1a322b712b467023d825'
-         '4dfd9dc0d69b375587e39ab2621d9ea9'
-         '61e970d0704875b1da83cb4e9fc0eef5')
diff --git a/testing/fssos-nsvs/fssos-nsvs.install b/testing/fssos-nsvs/fssos-nsvs.install
deleted file mode 100644
index 253ae64d2..000000000
--- a/testing/fssos-nsvs/fssos-nsvs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    if [ -z "`grep '^nsvsd::' /etc/group`" ]; then
-	groupadd -g 83 nsvsd
-    fi
-    if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then
-	useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    userdel nsvsd &> /dev/null
-    groupdel nsvsd &> /dev/null
-}
diff --git a/testing/fssos-nsvs/nsvsd b/testing/fssos-nsvs/nsvsd
deleted file mode 100755
index f9b4845ab..000000000
--- a/testing/fssos-nsvs/nsvsd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting nsvsd"
-	/usr/sbin/nsvsd -f /etc/nsvsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon nsvsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nsvsd"
-    kill `cat /var/run/nsvsd.pid` &>/dev/null
-    rm -f /var/run/nsvsd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon nsvsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/fssos-nsvs/nsvsd.service b/testing/fssos-nsvs/nsvsd.service
deleted file mode 100644
index 0df5444ab..000000000
--- a/testing/fssos-nsvs/nsvsd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Name Service Via Sockets Daemon
-
-[Service]
-ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ftgl/PKGBUILD b/testing/ftgl/PKGBUILD
deleted file mode 100644
index 590190dae..000000000
--- a/testing/ftgl/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168280 2012-10-07 17:22:30Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-
-pkgname=ftgl
-_pkgver=2.1.3-rc5
-pkgver=${_pkgver/-/}
-pkgrel=4
-pkgdesc="OpenGL library to use arbitrary fonts"
-arch=(i686 x86_64)
-url="http://ftgl.wiki.sourceforge.net/"
-license=(MIT)
-depends=(freetype2 mesa glu)
-makedepends=(doxygen)
-options=('!libtool')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2")
-md5sums=('c7879018cde844059495b3029b0b6503')
-
-build() {
-  cd "$srcdir/$pkgname-${_pkgver/-/~}"
-  ./configure --prefix=/usr --with-pic --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-${_pkgver/-/~}"
-  make DESTDIR="$pkgdir" install
-
-  # FS#23283: install missing headers for OpenCascade
-  install -m644 src/FT{Face,Library,Size}.h "$pkgdir/usr/include/FTGL/"
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/fyre/PKGBUILD b/testing/fyre/PKGBUILD
deleted file mode 100644
index 4e0b82218..000000000
--- a/testing/fyre/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169635 2012-10-25 01:35:01Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=fyre
-pkgver=1.0.1
-pkgrel=6
-pkgdesc="Rendering of the Peter de Jong map"
-arch=('i686' 'x86_64')
-url="http://fyre.navi.cx/"
-license=('GPL')
-depends=('openexr' 'libglade' 'gnet' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
-install=fyre.install
-source=(http://releases.navi.cx/fyre/fyre-${pkgver}.tar.bz2)
-sha1sums=('41c0ec45eff16cc1bba081c5c855a3980e404835')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make update_xdgmime=/bin/false update_fdodesktop=/bin/false gtk_update_icon_cache=/bin/false \
-    prefix="${pkgdir}/usr" install
-}
diff --git a/testing/fyre/fyre.install b/testing/fyre/fyre.install
deleted file mode 100644
index 388efbb11..000000000
--- a/testing/fyre/fyre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gc/PKGBUILD b/testing/gc/PKGBUILD
deleted file mode 100644
index 43dd94dbc..000000000
--- a/testing/gc/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 159218 2012-05-18 10:37:19Z jgc $
-# Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
-
-pkgname=gc
-pkgver=7.2
-pkgrel=1
-pkgdesc="A garbage collector for C and C++"
-arch=('i686' 'x86_64')
-url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
-license=('GPL')
-source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
-depends=('gcc-libs')
-options=('!libtool')
-md5sums=('d17aecedef3d73e75387fb63558fa4eb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-cplusplus
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share/gc"
-  install -m755 -d "${pkgdir}/usr/share/doc/gc"
-  install -m644 doc/README{,.{changes,contributors,environment,linux}} \
-    "${pkgdir}/usr/share/doc/gc/"
-
-  sed -i -e 's/GC_MALLOC 1L/gc 3/' doc/gc.man
-  install -m755 -d "${pkgdir}/usr/share/man/man3"
-  install -m644 doc/gc.man "${pkgdir}/usr/share/man/man3/gc.3"
-}
diff --git a/testing/gcalctool/PKGBUILD b/testing/gcalctool/PKGBUILD
deleted file mode 100644
index 0634cb9fe..000000000
--- a/testing/gcalctool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169250 2012-10-18 19:28:17Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gcalctool
-pkgver=6.6.1
-pkgrel=1
-pkgdesc="GNOME Scientific calculator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'dconf')
-makedepends=('intltool' 'yelp-tools')
-groups=('gnome-extra')
-options=(!emptydirs)
-url="http://www.gnome.org"
-install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('bc08a583f13f239a2b731f3478afa1077957b51563dd35f9ee303cb5f9b29016')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $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/gcc/PKGBUILD b/testing/gcc/PKGBUILD
deleted file mode 100644
index 993e23ea6..000000000
--- a/testing/gcc/PKGBUILD
+++ /dev/null
@@ -1,271 +0,0 @@
-# $Id: PKGBUILD 169654 2012-10-25 03:35:23Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.7.2
-pkgrel=2
-#_snapshot=4.7-20120721
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'doxygen')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	gcc_pure64.patch
-	gcc-4.7.1-libada-pic.patch
-	gcc-4.7.1-libgo-write.patch)
-md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         'ced48436c1b3c981d721a829f1094de1'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c')
-
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-  cd ${_basedir}
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
-
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-  
-  # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --disable-ppl-version-check --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu \
-      --disable-multilib --disable-libssp \
-      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
-      --enable-checking=release
-  make
-  
-  # make documentation
-  cd $CHOST/libstdc++-v3
-  make doc-man-doxygen
-}
-
-check() {
-  cd ${srcdir}/gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC"
-  groups=('base')
-  depends=('glibc>=2.16')
-  install=gcc-libs.install
-
-  cd ${srcdir}/gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src libitm; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-  make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl')
-  groups=('base-devel')
-  install=gcc.install
-
-  cd ${srcdir}/gcc-build
-  
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
-  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
-
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib/*.so*
-  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
-  rm -r $pkgdir/usr/lib/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages expect this symlinks
-  ln -s gcc ${pkgdir}/usr/bin/cc
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 -t ${pkgdir}/usr/share/man/man3 \
-    ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran()
-{
-  pkgdesc="Fortran front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-fortran.install
-
-  cd ${srcdir}/gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-
-  ln -s gfortran ${pkgdir}/usr/bin/f95
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc()
-{
-  pkgdesc="Objective-C front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-
-  cd ${srcdir}/gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
-  pkgdesc="Ada front-end for GCC (GNAT)"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-ada.install
-
-  cd ${srcdir}/gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
-  ln -s gcc ${pkgdir}/usr/bin/gnatgcc
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
-  pkgdesc="Go front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-go.install
-
-  cd ${srcdir}/gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/testing/gcc/gcc-4.7.0-cloog-0.17.patch b/testing/gcc/gcc-4.7.0-cloog-0.17.patch
deleted file mode 100644
index c7146fa04..000000000
--- a/testing/gcc/gcc-4.7.0-cloog-0.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
diff --git a/testing/gcc/gcc-4.7.1-libada-pic.patch b/testing/gcc/gcc-4.7.1-libada-pic.patch
deleted file mode 100644
index 591da1e4a..000000000
--- a/testing/gcc/gcc-4.7.1-libada-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- 	-fexceptions -DIN_RTS @have_getipinfo@
- 
- host_subdir = @host_subdir@
diff --git a/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch
deleted file mode 100644
index 427efe8a6..000000000
--- a/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
--  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
--  rusage=`echo $rusage | sed -e 's/^ *//'`
-   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
-   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+  rusage=`echo $rusage | sed -e 's/^ *//'`
-   nrusage=
-   while test -n "$rusage"; do
-     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/testing/gcc/gcc-4.7.1-libgo-write.patch b/testing/gcc/gcc-4.7.1-libgo-write.patch
deleted file mode 100644
index a7be83fda..000000000
--- a/testing/gcc/gcc-4.7.1-libgo-write.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
---- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
-+++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
-@@ -17,7 +17,8 @@
- 	G* g = runtime_g();
- 
- 	if(g == nil || g->writebuf == nil) {
--		runtime_write(2, v, n);
-+		ssize_t bytesWritten = runtime_write(2, v, n);
-+		(void)bytesWritten;
- 		return;
- 	}
- 	
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/testing/gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.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/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/testing/gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/testing/gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.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/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/testing/gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-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/gcc/gcc.install b/testing/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/testing/gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.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/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
deleted file mode 100644
index a9b09bbcf..000000000
--- a/testing/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
---- gcc-orig/gcc/config/i386/linux64.h	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/linux64.h	2011-07-24 19:48:05.000000000 +1000
-@@ -28,6 +28,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
---- gcc-orig/gcc/config/i386/t-linux64	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/t-linux64	2011-07-24 19:49:41.000000000 +1000
-@@ -34,8 +34,8 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
- 
- LIBGCC = stmp-multilib
diff --git a/testing/gcc4.6/PKGBUILD b/testing/gcc4.6/PKGBUILD
deleted file mode 100644
index 9ff9eac31..000000000
--- a/testing/gcc4.6/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 161915 2012-06-16 14:55:05Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-pkgname=gcc4.6
-pkgver=4.6.3
-_ver=${pkgver:0:3}
-pkgrel=2
-pkgdesc="The GNU Compiler Collection ($_ver; C and C++)"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-depends=('glibc' 'binutils' 'gmp' 'mpfr' 'libmpc' 'ppl' 'isl' 'cloog')
-makedepends=('flex' 'bison')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        gcc_pure64.patch
-        gcc-hash-style-both.patch
-        gcc-4.6.2-cloog-0.17.patch)
-md5sums=('773092fe5194353b02bb0110052a972e'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f'
-         '6d9939a2e667376031679ac9f9c49263')
-
-build() {
-  cd gcc-$pkgver
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
-  patch -p0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  # compatibility with latest cloog
-  patch -p1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ..
-  mkdir gcc-build
-  cd gcc-build
-
-  ../gcc-$pkgver/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --datadir=/usr/share/gcc-$_ver \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,lto \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --disable-multilib --disable-libssp \
-      --enable-checking=release \
-      --program-suffix=-$_ver \
-      --enable-version-specific-runtime-libs
-
-  make
-}
-
-check() {
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -C gcc-build -k check || true
-  gcc-$pkgver/contrib/test_summary
-}
-
-package()
-{
-  make -j1 -C gcc-build DESTDIR=${pkgdir} install
-
-  # Install Runtime Library Exception
-  install -Dm644 gcc-$pkgver/COPYING.RUNTIME \
-    $pkgdir/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
-
-  # deal with conflicting man and info pages
-  cd $pkgdir
-  rm usr/share/man/man7/{fsf-funding,gfdl,gpl}.7
-  for i in usr/share/info/*; do
-    mv $i ${i%.info}-$_ver.info
-  done
-}
diff --git a/testing/gcc4.6/gcc-4.6.2-cloog-0.17.patch b/testing/gcc4.6/gcc-4.6.2-cloog-0.17.patch
deleted file mode 100644
index 0503a05ed..000000000
--- a/testing/gcc4.6/gcc-4.6.2-cloog-0.17.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
-diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c	2011-03-13 08:05:38.000000000 +1000
-+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c	2012-02-03 17:51:47.943463879 +1000
-@@ -1367,7 +1367,7 @@
-   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
-      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
-      we pass an incomplete program to cloog.  */
--  options->language = LANGUAGE_C;
-+  options->language = CLOOG_LANGUAGE_C;
- 
-   /* Enable complex equality spreading: removes dummy statements
-      (assignments) in the generated code which repeats the
diff --git a/testing/gcc4.6/gcc-hash-style-both.patch b/testing/gcc4.6/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/testing/gcc4.6/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/testing/gcc4.6/gcc_pure64.patch b/testing/gcc4.6/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/testing/gcc4.6/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/testing/gcr/PKGBUILD b/testing/gcr/PKGBUILD
deleted file mode 100644
index ef21fdbbd..000000000
--- a/testing/gcr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169249 2012-10-18 19:28:14Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gcr
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A library for bits of crypto UI and parsing"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-install=gcr.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d95f8b70bdcc371c2712ba166e124114bd99bbde1173c0cbe7a8462f146a9927')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --libexec=/usr/lib/gcr \
-    --disable-static \
-    --disable-update-mime \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gcr/gcr.install b/testing/gcr/gcr.install
deleted file mode 100644
index 8677671c4..000000000
--- a/testing/gcr/gcr.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-mime-database /usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gdk-pixbuf2/PKGBUILD b/testing/gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index e3dc9a299..000000000
--- a/testing/gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169248 2012-10-18 19:28:10Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gdk-pixbuf2
-pkgver=2.26.4
-pkgrel=1
-pkgdesc="An image loading library"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be')
-
-build() {
-  cd gdk-pixbuf-$pkgver
-
-  ./configure --prefix=/usr \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd gdk-pixbuf-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gdk-pixbuf2/gdk-pixbuf2.install b/testing/gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index f04c0967a..000000000
--- a/testing/gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-   gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD
deleted file mode 100644
index efbed0c95..000000000
--- a/testing/gdl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169247 2012-10-18 19:28:06Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdl
-pkgver=3.6.0
-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=('32a04fc96667e2f7ca1e3c853b996da3e62f4811b2a90d62cb2081f68aeecac3')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
deleted file mode 100644
index a7f614765..000000000
--- a/testing/gdm/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 169280 2012-10-18 19:45:52Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdm
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Gnome Display Manager"
-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-launch-environment
-        etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf)
-groups=(gnome)
-options=('!libtool')
-depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
-         xorg-xrdb nss polkit-gnome)
-makedepends=(itstool intltool gnome-doc-utils xorg-server gobject-introspection)
-optdepends=('gnome-shell: new login interface'
-            'fprintd: fingerprint authentication')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix_external_program_directories.patch)
-sha256sums=('aff69dde55e11b540145002c95cf966cd16376910283b385520431ced10c5031'
-            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
-
-build() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/gdm \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-schemas-compile \
-    --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
-    --with-check-accelerated-directory=/usr/lib/gnome-session \
-    --with-authentication-agent-directory=/usr/lib/polkit-gnome \
-    --without-tcp-wrappers \
-    --without-console-kit \
-    --with-systemd \
-    --with-default-pam-config=exherbo
-
-  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 -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  chmod 1770 "$pkgdir/var/log/gdm"
-  chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
-  rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
-}
diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch
deleted file mode 100644
index 5e51a776f..000000000
--- a/testing/gdm/fix_external_program_directories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:05.304823391 +0000
-+++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:17.004732251 +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 bc0193df0..000000000
--- a/testing/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,20 +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_access.so
-account         required        pam_time.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 38fab5782..000000000
--- a/testing/gdm/gdm-fingerprint.pam
+++ /dev/null
@@ -1,20 +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_access.so
-account         required        pam_time.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 eed5e1003..000000000
--- a/testing/gdm/gdm-password.pam
+++ /dev/null
@@ -1,22 +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_access.so
-account         required        pam_time.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 force 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 c5c29e73f..000000000
--- a/testing/gdm/gdm-smartcard.pam
+++ /dev/null
@@ -1,20 +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_access.so
-account         required        pam_time.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 c48faf4ae..000000000
--- a/testing/gdm/gdm.install
+++ /dev/null
@@ -1,30 +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
-
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  dconf update
-}
-
-pre_upgrade() {
-  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
-  dconf update
-  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/gdm/gdm.service b/testing/gdm/gdm.service
deleted file mode 100644
index 0125934d6..000000000
--- a/testing/gdm/gdm.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Gnome Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/sbin/gdm -nodaemon
-Restart=always
-
-[Install]
-Alias=display-manager.service
diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD
deleted file mode 100644
index 62827d8bc..000000000
--- a/testing/gedit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169246 2012-10-18 19:28:03Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gedit
-pkgver=3.6.1
-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=('yelp-tools' '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=('75fb18e32a7571900dda8cbd3a71212bded1ef714d3aa9f9513296eea02779a4')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \
-      --enable-python
-  make
-}
-
-package(){
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install
deleted file mode 100644
index 606920688..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
-        gconfpkg --uninstall gedit
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/geeqie/PKGBUILD b/testing/geeqie/PKGBUILD
deleted file mode 100644
index bb9a07057..000000000
--- a/testing/geeqie/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 164675 2012-08-02 15:21:18Z andrea $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=geeqie
-pkgver=1.0
-pkgrel=7
-pkgdesc="A lightweight image browser and viewer (fork of GQview)"
-arch=('i686' 'x86_64')
-url="http://geeqie.sourceforge.net/"
-license=('GPL3')
-depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
-makedepends=('intltool' 'doxygen' 'gnome-doc-utils')
-optdepends=('librsvg: SVG rendering')
-replaces=('gqview-devel')
-install=geeqie.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('8494a557d67d20e6ad720645ec789dd2b33a3266')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/geeqie/geeqie.install b/testing/geeqie/geeqie.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/testing/geeqie/geeqie.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gegl/PKGBUILD b/testing/gegl/PKGBUILD
deleted file mode 100644
index c9f3a38cf..000000000
--- a/testing/gegl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169636 2012-10-25 01:35:02Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=gegl
-pkgver=0.2.0
-pkgrel=5
-pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
-url="http://www.gegl.org/"
-license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
-makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
-optdepends=('openexr: for using the openexr plugin' \
-            'ffmpeg: for using the ffmpeg plugin' \
-            'librsvg: for using the svg plugin' \
-            'jasper: for using the jasper plugin')
-options=('!libtool')
-source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gegl-0.2.0-ffmpeg-0.11.diff)
-sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
-          'c10fd988c634fcf0948cc91a51d6528f6f1704ba')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
-  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
-    --with-libavformat --with-jasper --disable-docs
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/testing/gegl/gegl-0.2.0-ffmpeg-0.11.diff
deleted file mode 100644
index a33ec6f7f..000000000
--- a/testing/gegl/gegl-0.2.0-ffmpeg-0.11.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
---- gegl-0.2.0/operations/external/ff-load.c	2012-04-01 13:17:57.000000000 +0200
-+++ gegl-0.2.0-1/operations/external/ff-load.c	2012-07-11 12:42:05.174756560 +0200
-@@ -271,7 +271,7 @@
-       gint err;
- 
-       ff_cleanup (o);
--      err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+err = avformat_open_input (&p->ic, o->path, NULL, NULL);
-       if (err < 0)
-         {
-           print_error (o->path, err);
diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD
deleted file mode 100644
index edd527ba7..000000000
--- a/testing/ghc/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 167880 2012-10-03 15:19:04Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Special note for devs looking to upgrade this package:
-#   ghc places a unique hash for each library when it is built.
-#   Libraries depend on versions specified by those hashes.
-#   This implies that all libraries need to be rebuilt when ghc is rebuilt.
-
-pkgname=ghc
-pkgver=7.6.1
-pkgrel=1
-pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/ghc/'
-license=('custom')
-# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496
-depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi')
-makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
-checkdepends=('python2')
-install='ghc.install'
-# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-#options=('!makeflags')
-# missing rtl?
-provides=('haskell-array=0.4.0.1'
-          'haskell-base=4.6.0.0'
-          'haskell-binary=0.5.1.1'
-          'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.10.0.0'
-          'haskell-containers=0.5.0.0'
-          'haskell-deepseq=1.3.0.1'
-          'haskell-directory=1.2.0.0'
-          'haskell-filepath=1.3.0.1'
-          'haskell-ghc-prim=0.3.0.0'
-          'haskell-haskell2010=1.1.1.0'
-          'haskell-haskell98=2.0.0.2'
-          'haskell-hoopl=3.9.0.0'
-          'haskell-hpc=0.6.0.0'
-          'haskell-integer-gmp=0.5.0.0'
-          'haskell-old-locale=1.0.0.5'
-          'haskell-old-time=1.1.0.1'
-          'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.2'
-          'haskell-template-haskell=2.8.0.0'
-          'haskell-time=1.4.0.1'
-          'haskell-unix=2.6.0.0'
-          'haskell-cabal=1.16.0')
-replaces=('haskell-array<0.4.0.1'
-          'haskell-base<4.6.0.0'
-          'haskell-binary<0.5.1.1'
-          'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.10.0.0'
-          'haskell-containers<0.5.0.0'
-          'haskell-deepseq<1.3.0.1'
-          'haskell-directory<1.2.0.0'
-          'haskell-filepath<1.3.0.1'
-          'haskell-ghc-prim<0.3.0.0'
-          'haskell-haskell2010<1.1.1.0'
-          'haskell-haskell98<2.0.0.2'
-          'haskell-hoopl<3.9.0.0'
-          'haskell-hpc<0.6.0.0'
-          'haskell-integer-gmp<0.5.0.0'
-          'haskell-old-locale<1.0.0.5'
-          'haskell-old-time<1.1.0.1'
-          'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.2'
-          'haskell-template-haskell<2.8.0.0'
-          'haskell-time<1.4.0.1'
-          'haskell-unix<2.6.0.0'
-          'haskell-cabal<1.16.0')
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
-        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('e9d892d2970550ec5e70130b3621f6b6'
-         '0d93c458e3b445a7e524ef6ae459ce11'
-         'c367ef26300648ee9b8aca3dee5c9669')
-
-build() {
-  cd ghc-${pkgver}
-
-  cp ${srcdir}/build.mk mk/build.mk
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-check() {
-  # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-  unset MAKEFLAGS
-
-  cd ghc-${pkgver}
-
-  # python2 rename
-  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
-  sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
-
-  # upstream known failures on both i686 and x86_64:
-  #    ghci.debugger/scripts     break011 [bad stderr] (ghci)
-  #    perf/compiler             parsing001 [stat not good enough] (normal)
-  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
-  # upstream known failures on i686 only:
-  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
-  make test
-
-  # enabling threads to speed up
-  # causes more failures than make test, need to investigate
-  # upstream known failures on both i686 and x86_64:
-  #    perf/compiler             parsing001 [stat not good enough] (normal)
-  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
-  # upstream known failures on i686 only:
-  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
-  #make THREADS=9 test
-
-  # will most likely cause lots of failures
-  # enable this when upstream has 0 test failures from a simple 'make test'
-  # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757
-  #make fulltest
-}
-
-package() {
-  cd ghc-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/licenses/ghc
-  install -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/ghc
-}
diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk
deleted file mode 100644
index bb57594bf..000000000
--- a/testing/ghc/build.mk
+++ /dev/null
@@ -1,200 +0,0 @@
-# -----------------------------------------------------------------------------
-# A Sample build.mk
-#
-# Uncomment one of the following BuildFlavour settings to get the desired
-# overall build type, and then tweak the options in the relevant section
-# below.
-
-# Uncomment one of these to select a build profile below:
-
-# Full build with max optimisation and everything enabled (very slow build)
-BuildFlavour = perf
-
-# As above but build GHC using the LLVM backend
-#BuildFlavour = perf-llvm
-
-# Fast build with optimised libraries, no profiling (RECOMMENDED):
-#BuildFlavour = quick
-
-# Even faster build.  NOT RECOMMENDED: the libraries will be
-# completely unoptimised, so any code built with this compiler
-# (including stage2) will run very slowly:
-#BuildFlavour = quickest
-
-# Profile the stage2 compiler:
-#BuildFlavour = prof
-
-# A development build, working on the stage 1 compiler:
-#BuildFlavour = devel1
-
-# A development build, working on the stage 2 compiler:
-#BuildFlavour = devel2
-
-# An unregisterised, optimised build of ghc, for porting:
-#BuildFlavour = unreg
-
-GhcLibWays = v
-
-# -------- 1. A Performance/Distribution build--------------------------------
-
-ifeq "$(BuildFlavour)" "perf"
-
-# perf matches the default settings, repeated here for comparison:
-
-SRC_HC_OPTS     = -O -H64m
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O2 -fasm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# ---------------- Perf build using LLVM -------------------------------------
-
-ifeq "$(BuildFlavour)" "perf-llvm"
-
-SRC_HC_OPTS     = -O -H64m -fllvm
-GhcStage1HcOpts = -O -fllvm
-GhcStage2HcOpts = -O2 -fllvm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# -------- A Fast build ------------------------------------------------------
-
-ifeq "$(BuildFlavour)" "quickest"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O0 -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- A Fast build with optimised libs ----------------------------------
-
-ifeq "$(BuildFlavour)" "quick"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- Profile the stage2 compiler ---------------------------------------
-
-ifeq "$(BuildFlavour)" "prof"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O -fasm
-GhcLibHcOpts       = -O -fasm
-
-GhcLibWays         += p
-GhcProfiled        = YES
-
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-
-# -------- A Development build (stage 1) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel1"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts    = -Rghc-timing -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = YES
-
-endif
-
-# -------- A Development build (stage 2) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel2"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O -fasm
-GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = YES
-
-# After stage 1 and the libraries have been built, you can uncomment this line:
-
-# stage=2
-
-# Then stage 1 will not be touched by the build system, until
-# you comment the line again.  This is a useful trick for when you're
-# working on stage 2 and want to freeze stage 1 and the libraries for
-# a while.
-
-endif
-
-# -------- A Unregisterised build) -------------------------------------------
-
-ifeq "$(BuildFlavour)" "unreg"
-
-# Note that the LLVM backend works in unregisterised mode as well as
-# registerised mode. This often makes it a good choice for porting
-# GHC.
-
-GhcUnregisterised    = YES
-GhcWithNativeCodeGen = NO
-
-SRC_HC_OPTS          = -O -H64m # -fllvm
-GhcStage1HcOpts      = -O
-GhcStage2HcOpts      = -O2
-GhcHcOpts            = -Rghc-timing
-GhcLibHcOpts         = -O2
-SplitObjs            = NO
-HADDOCK_DOCS         = NO
-BUILD_DOCBOOK_HTML   = NO
-BUILD_DOCBOOK_PS     = NO
-BUILD_DOCBOOK_PDF    = NO
-
-endif
-
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
-
-# NoFib settings
-NoFibWays =
-STRIP_CMD = :
-
diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install
deleted file mode 100644
index c0200e4a6..000000000
--- a/testing/ghc/ghc.install
+++ /dev/null
@@ -1,10 +0,0 @@
-pre_upgrade() {
-  echo '==> Unregistering cabalized packages...'
-  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
-  echo '==> Done.'
-}
-
-post_upgrade() {
-  echo '==> All cabalized packages need to be reinstalled now.'
-  echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
-}
diff --git a/testing/ghc/print-provides-replaces.sh b/testing/ghc/print-provides-replaces.sh
deleted file mode 100755
index 33d1da051..000000000
--- a/testing/ghc/print-provides-replaces.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. PKGBUILD
-
-if [[ ! -d src/ghc-${pkgver}/libraries ]]; then
-  echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/"
-  exit 1
-fi
-
-declare -A exclude
-# no Win32 cause we're not building on windows
-exclude['Win32']=1
-# no integer-simple because we use integer-gmp
-exclude['integer-simple']=1
-# extract excluded libraries from ghc.mk
-for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
-  exclude[${exclude_pkg}]=1
-done
-
-cd src/ghc-${pkgver}/libraries
-
-# $1 is the name of the variable
-# $2 is the string for the test, either '=' or '<'
-print_var() {
-  printf "$1=("
-  for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
-    [[ ${exclude[${pkg}]} ]] && continue
-    version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
-    printf "'haskell-$pkg$2$version'\n          "
-  done
-  # also add cabal
-  version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
-  printf "'haskell-cabal$2$version'\n          "
-  echo -e '\b)'
-}
-
-print_var 'provides' '='
-print_var 'replaces' '<'
diff --git a/testing/ghc/silence-gen_contents_index.diff b/testing/ghc/silence-gen_contents_index.diff
deleted file mode 100644
index 6d835f8fb..000000000
--- a/testing/ghc/silence-gen_contents_index.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ghc-7.4.2/libraries/gen_contents_index.original	2012-06-10 22:23:28.810059378 +0000
-+++ ghc-7.4.2/libraries/gen_contents_index	2012-06-10 22:24:00.289814576 +0000
-@@ -47,7 +47,6 @@
- esac
- 
- # Now create the combined contents and index pages
--echo $HADDOCK_ARGS
- $HADDOCK --gen-index --gen-contents -o . \
-          -t "Haskell Hierarchical Libraries" \
-          -p "prologue.txt" \
diff --git a/testing/ghex/PKGBUILD b/testing/ghex/PKGBUILD
deleted file mode 100644
index adb0e8281..000000000
--- a/testing/ghex/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169245 2012-10-18 19:28:00Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=ghex
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A simple binary editor for the Gnome desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/Ghex"
-depends=('gtk3' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=ghex.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/ghex/ghex.install b/testing/ghex/ghex.install
deleted file mode 100644
index 084bc82ee..000000000
--- a/testing/ghex/ghex.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=ghex
-
-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
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gimp-ufraw/PKGBUILD b/testing/gimp-ufraw/PKGBUILD
deleted file mode 100644
index a1fb561fd..000000000
--- a/testing/gimp-ufraw/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 164676 2012-08-02 15:21:23Z andrea $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=gimp-ufraw
-pkgver=0.18
-pkgrel=5
-pkgdesc="Standalone or gimp plugin converter for raw files"
-url="http://ufraw.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils')
-makedepends=('gimp' 'cinepaint')
-optdepends=('gimp: to use the gimp import plugin for raw images'
-            'cinepaint: to use the cinepaint import plugin for raw images')
-install=gimp-ufraw.install
-source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz)
-sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2')
-
-build() {
-  cd "${srcdir}/ufraw-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --enable-extras \
-              --enable-mime \
-              --enable-openmp
-  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/ufraw-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/bin/dcraw"
-}
diff --git a/testing/gimp-ufraw/gimp-ufraw.install b/testing/gimp-ufraw/gimp-ufraw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/gimp-ufraw/gimp-ufraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/git/ChangeLog b/testing/git/ChangeLog
deleted file mode 100644
index f0c15233e..000000000
--- a/testing/git/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
-Simple version bumps are omitted from the following ChangeLog.
-
-2011-08-16 Dan McGee <dan@archlinux.org>
-	Version 1.7.6.1-1
-	* Enable USE_LIBPCRE for `git grep -P` usage
-
-2011-05-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.5.1-1
-	* Byte compile emacs files (FS#20874)
-	* Respect CFLAGS/LDFLAGS (FS#23963)
-
-2011-04-27 Dan McGee <dan@archlinux.org>
-	Version 1.7.5-1
-	* Add missing optdepends for git send-email (FS#20923)
-
-2011-01-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.3.5-1
-	* More flexible git-daemon RC scripts (FS#20575)
-
-2010-10-01 Allan McRae <allan@archlinux.org>
-	Version 1.7.3.1-2
-	* Python 2/3 rebuild
-
-2010-06-29 Dan McGee <dan@archlinux.org>
-	Version 1.7.1.1-1
-	* Add emacs completion files (FS#17968)
-	* Add git-daemon RC scripts (FS#19291)
-
-2009-06-05 Dan McGee <dan@archlinux.org>
-	Version 1.6.3.2-1
-	* Remove gitweb from /usr/share; it needs customization to be helpful
-	* Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683)
-
-2008-09-14 Dan McGee <dan@archlinux.org>
-	Version 1.6.0.2-1
-	* Moved optional depends from install file to optdepends array
-
-2008-06-15 Dan McGee <dan@archlinux.org>
-	Version 1.5.6-1
-	* Removed 'cpio' dependency, clone is now a builtin and no longer needs it
-
-2008-02-02 Dan McGee <dan@archlinux.org>
-	Version 1.5.4-1
-	* Upstream version 1.5.4
-	* Enable pthreads support in pack-objects. To use, set the pack.threads
-	  git config option. Read manpages of pack-objects and config for more
-	  details.
-	* Changelog added (with entries going back a bit).
-
-2008-01-28 Kevin Piche <kevin@archlinux.org>
-	Version 1.5.3.7-2
-	* Updated for new perl policy (vendor dirs)
-	* Change license to GPL2
-
-2007-11-01 Eric Belanger <eric@archlinux.org>
-	Version 1.5.3.5-2
-	* Fix Perl module location
diff --git a/testing/git/PKGBUILD b/testing/git/PKGBUILD
deleted file mode 100644
index bc0f8c8df..000000000
--- a/testing/git/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# $Id: PKGBUILD 165368 2012-08-16 14:45:26Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=git
-pkgver=1.7.11.5
-pkgrel=2
-pkgdesc="the fast distributed version control system"
-arch=(i686 x86_64)
-url="http://git-scm.com/"
-license=('GPL2')
-depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs')
-optdepends=('tk: gitk and git gui'
-            'perl-libwww: git svn'
-            'perl-term-readkey: git svn'
-            'perl-mime-tools: git send-email'
-            'perl-net-smtp-ssl: git send-email TLS support'
-            'perl-authen-sasl: git send-email TLS support'
-            'python2: various helper scripts'
-            'subversion: git svn'
-            'cvsps: git cvsimport')
-replaces=('git-core')
-provides=('git-core')
-backup=('etc/conf.d/git-daemon.conf')
-install=git.install
-source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
-        "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
-        git-daemon
-        git-daemon.conf
-        git-daemon@.service
-        git-daemon.socket)
-changelog=ChangeLog
-
-build() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    all
-
-  cd contrib/emacs
-  make prefix=/usr
-}
-
-check() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  local jobs
-  jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*')
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    NO_SVN_TESTS=y \
-    DEFAULT_TEST_TARGET=prove \
-    GIT_PROVE_OPTS="$jobs -Q" \
-    GIT_TEST_OPTS="--root=/dev/shm/" \
-    test
-}
-
-package() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
-
-  # bash completion
-  # until this is fixed, no point in loading it dynamically:
-  # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html
-  #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
-  #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git 
-  mkdir -p "$pkgdir"/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git 
-  # more contrib stuff
-  cp -a ./contrib $pkgdir/usr/share/git/ 
-  # scripts are for python 2.x
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
-    $(find "$pkgdir" -name '*.py') \
-    "$pkgdir"/usr/lib/git-core/git-p4 \
-    "$pkgdir"/usr/share/git/gitview/gitview
-
-  # emacs interface
-  cd contrib/emacs
-  make prefix=/usr DESTDIR="$pkgdir" install
-
-  # how 'bout some manpages?
-  for mansect in man1 man5 man7; do
-    for manpage in "$srcdir"/$mansect/*; do
-      install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage)
-    done
-  done
-
-  # remove perllocal.pod, .packlist, and empty directories.
-  rm -rf "$pkgdir"/usr/lib/perl5
-
-  # git daemon script
-  install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon
-  install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
-
-  # systemd stuff
-  install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service
-  install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
-}
-
-md5sums=('9985d35c11531d546426ebefb327c847'
-         'f08a5a60e57f00399bbd384cfd7791f3'
-         '8e2648910fd5dd4f1c41d3c7fa9e9156'
-         '2e42bf97779a1c6411d89043334c9e78'
-         '198ef9d9e79bd8d5868f95ed9f79cc34'
-         '779c00deb490291c6b477b8cc0161123')
diff --git a/testing/git/git-daemon b/testing/git/git-daemon
deleted file mode 100644
index 21ba73ed5..000000000
--- a/testing/git/git-daemon
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-daemon_bin="/usr/lib/git-core/git-daemon"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      # RUN
-      $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/git/git-daemon.conf b/testing/git/git-daemon.conf
deleted file mode 100644
index 3f9a12060..000000000
--- a/testing/git/git-daemon.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# path to git repositories served
-GIT_REPO="/srv/git/"
-# see `man git-daemon` for all available options
-# $GIT_REPO will be present twice in most configs
-GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
diff --git a/testing/git/git-daemon.socket b/testing/git/git-daemon.socket
deleted file mode 100644
index c84740588..000000000
--- a/testing/git/git-daemon.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Git Daemon Socket
-After=network.target
-
-[Socket]
-ListenStream=9418
-Accept=true
-
-[Install]
-WantedBy=sockets.target
diff --git a/testing/git/git-daemon@.service b/testing/git/git-daemon@.service
deleted file mode 100644
index 67d4cfa9c..000000000
--- a/testing/git/git-daemon@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Git Daemon Instance
-After=network.target
-
-[Service]
-User=git
-# The '-' is to ignore non-zero exit statuses
-ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git
-StandardInput=socket
-StandardOutput=inherit
-StandardError=journal
diff --git a/testing/git/git.install b/testing/git/git.install
deleted file mode 100644
index 9edc065ba..000000000
--- a/testing/git/git.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  if ! getent group git >/dev/null; then
-    groupadd --system git 
-  fi
-  if ! getent passwd git >/dev/null; then
-    useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git 
-    passwd -l git >/dev/null
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  if getent passwd git >/dev/null; then
-    userdel git
-  fi
-  if getent group git >/dev/null; then
-    groupdel git
-  fi
-}
diff --git a/testing/gjs/PKGBUILD b/testing/gjs/PKGBUILD
deleted file mode 100644
index c08ea4dc7..000000000
--- a/testing/gjs/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169244 2012-10-18 19:27:55Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gjs
-pkgver=1.34.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/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|python|python2|' scripts/make-tests
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/glade/PKGBUILD b/testing/glade/PKGBUILD
deleted file mode 100644
index 280591b87..000000000
--- a/testing/glade/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169243 2012-10-18 19:27:52Z jgc $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=glade
-pkgver=3.14.1
-pkgrel=1
-pkgdesc="User interface builder for GTK+ and GNOME."
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
-optdepends=('python2: Python widgets support')
-options=('!libtool')
-url="http://glade.gnome.org/"
-install=glade.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8484b62c7a4579ea3e5d98200b397a1baf0b621c0b0c70242ee1dbbe449eae20')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/glade/glade.install b/testing/glade/glade.install
deleted file mode 100644
index bce670aff..000000000
--- a/testing/glade/glade.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/glew/PKGBUILD b/testing/glew/PKGBUILD
deleted file mode 100644
index a644afaaf..000000000
--- a/testing/glew/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169637 2012-10-25 01:35:04Z eric $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: SleepyDog
-
-pkgname=glew
-pkgver=1.9.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' 'glu')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe')
-
-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 7e6f403ac..000000000
--- a/testing/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169240 2012-10-18 19:27:39Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=glib-networking
-pkgver=2.34.0
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c56eb4161671bff9568f3a92a88531ca01217eb7ee8514bb6255730400f877f1')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
-  make
-}
-
-package() {
-  cd "$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 8214e1968..000000000
--- a/testing/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
deleted file mode 100644
index bc162b826..000000000
--- a/testing/glib2/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169242 2012-10-18 19:27:48Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.34.1
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre' 'libffi')
-makedepends=('pkg-config' 'python2')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-        revert-warn-glib-compile-schemas.patch)
-sha256sums=('6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
-
-build() {
-  cd glib-$pkgver
-  patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-package() {
-  cd glib-$pkgver
-  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
-
-  for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
-      chmod -x "$_i"
-  done
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
-}
diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2ffa..000000000
--- a/testing/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh
deleted file mode 100644
index 96a056e1e..000000000
--- a/testing/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
diff --git a/testing/glib2/revert-warn-glib-compile-schemas.patch b/testing/glib2/revert-warn-glib-compile-schemas.patch
deleted file mode 100644
index 75b05103c..000000000
--- a/testing/glib2/revert-warn-glib-compile-schemas.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Thu, 12 Apr 2012 23:55:34 +0000
-Subject: glib-compile-schemas: warn about bad dconf paths
-
-For quite some time the recommended usage of GSettings and dconf has
-been to use paths like /org/gnome/example/.  Use of /apps/ has spilled
-over from GConf and is continuing to make its way into a number of
-applications as they port.
-
-glib-compile-schemas will now warn about these types of paths being
-used.  This generates a lot of noise, but hopefully it will reduce the
-number of ported applications making this mistake.
----
-diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
-index cf02389..27d0181 100644
---- a/gio/glib-compile-schemas.c
-+++ b/gio/glib-compile-schemas.c
-@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState  *state,
-       return;
-     }
- 
-+  if (path && (g_str_has_prefix (path, "/apps/") ||
-+               g_str_has_prefix (path, "/desktop/") ||
-+               g_str_has_prefix (path, "/system/")))
-+    g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
-+                "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
-+
-   state->schema_state = schema_state_new (path, gettext_domain,
-                                           extends, extends_name, list_of);
- 
---
-cgit v0.9.0.2
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
deleted file mode 100644
index 0d8b274be..000000000
--- a/testing/glibc/PKGBUILD
+++ /dev/null
@@ -1,188 +0,0 @@
-# $Id: PKGBUILD 169652 2012-10-25 03:25:47Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-pkgname=glibc
-pkgver=2.16.0
-pkgrel=5
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('linux-api-headers>=3.5' 'tzdata')
-makedepends=('gcc>=4.7')
-backup=(etc/gai.conf
-        etc/locale.gen
-        etc/nscd.conf)
-options=('!strip')
-install=glibc.install
-source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-        glibc-2.15-fix-res_query-assert.patch
-        glibc-2.16-unlock-mutex.patch
-        glibc-2.16-rpcgen-cpp-path.patch
-        glibc-2.16-strncasecmp-segfault.patch
-        glibc-2.16-strtod-overflow.patch
-        glibc-2.16-detect-fma.patch
-        glibc-2.16-glob-use-size_t.patch
-        nscd.rcd
-        nscd.service
-        nscd.tmpfiles
-        locale.gen.txt
-        locale-gen)
-md5sums=('80b181b02ab249524ec92822c0174cf7'
-         '2a1221a15575820751c325ef4d2fbb90'
-         '31f415b41197d85d3bbee3d1eecd06a3'
-         '0afcd8c6020d61684aba63ed5f26bd91'
-         'ea6a43915474e8276e9361eed6a01280'
-         'f042d37cc8ca3459023431809039bc88'
-         '61d322f7681a85d3293ada5c3ccc2c7e'
-         '2426f593bc43f5499c41d21b57ee0e30'
-         'a441353901992feda4b15a11a20140a1'
-         '589d79041aa767a5179eaa4e2737dd3f'
-         'c1e07c0bec0fe89791bfd9d13fc85edf'
-         'bccbe5619e75cf1d97312ec3681c605c'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # fix res_query assertion
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
-
-  # prevent hang by locked mutex
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=c30e8edf
-  patch -p1 -i ${srcdir}/glibc-2.16-unlock-mutex.patch
-
-  # prevent need for /lib/cpp symlink
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
-  patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
-
-  # strncasecmp segfault on i686
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737
-  patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch
-
-  # strtod integer/buffer overflow
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319
-  patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch
-
-  # detect FMA supprt
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=a5cfcf08
-  patch -p1 -i ${srcdir}/glibc-2.16-detect-fma.patch
-  
-  # prevent overflow in globc
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6c62f108
-  patch -p1 -i ${srcdir}/glibc-2.16-glob-use-size_t.patch
-
-  # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
-  sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  if [[ ${CARCH} = "i686" ]]; then
-    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-    # TODO: make separate glibc-xen package for i686
-    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-  fi
-
-  echo "slibdir=/usr/lib" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
-      --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization \
-      --enable-multi-arch
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "/build-programs=/s#no#yes#" configparms
-  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  make
-
-  # remove harding in preparation to run test-suite
-  sed -i '2,4d' configparms
-}
-
-check() {
-  cd ${srcdir}/glibc-build
-  make check
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
-
-  make install_root=${pkgdir} install
-
-  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
-
-  # eventually this will move to the filesystem package
-  ln -s usr/lib ${pkgdir}/lib
-
-  install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
-
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
-  install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd
-  install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
-
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
-
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
-
-  # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
-    ${srcdir}/glibc-2.16.0/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
-
-  if [[ ${CARCH} = "x86_64" ]]; then
-    # fix paths and compliance with binary blobs...
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-    ln -s usr/lib ${pkgdir}/lib64
-  fi
-
-  # Do not strip the following files for improved debugging support
-  # ("improved" as in not breaking gdb and valgrind...):
-  #   ld-${pkgver}.so
-  #   libc-${pkgver}.so
-  #   libpthread-${pkgver}.so
-  #   libthread_db-1.0.so
-
-  cd $pkgdir
-  strip $STRIP_BINARIES sbin/{ldconfig,sln} \
-                        usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \
-                        usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
-                        usr/lib/getconf/* \
-                        usr/sbin/{iconvconfig,nscd}
-  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
-
-  strip $STRIP_STATIC usr/lib/*.a
-
-  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
-                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib/{pt_chown,{audit,gconv}/*.so}
-}
diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/testing/glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0)
--	{
--	  if (map->l_type == lt_loaded)
--	    dl_close_state = rerun;
--	  else if (map->l_type == lt_library)
--	    {
--	      struct link_map **oldp = map->l_initfini;
--	      map->l_initfini = map->l_orig_initfini;
--	      _dl_scope_free (oldp);
--	    }
--	}
-+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+	dl_close_state = rerun;
- 
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- 		  nneeded * sizeof needed[0]);
- 	  atomic_write_barrier ();
- 	  l->l_initfini = l_initfini;
-+	  l->l_free_initfini = 1;
- 	}
- 
-       /* If we have no auxiliary objects just go on to the next map.  */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
-   l_initfini[nlist] = NULL;
-   atomic_write_barrier ();
-   map->l_initfini = l_initfini;
-+  map->l_free_initfini = 1;
-   if (l_reldeps != NULL)
-     {
-       atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
-       _dl_scope_free (old_l_reldeps);
-     }
-   if (old_l_initfini != NULL)
--      map->l_orig_initfini = old_l_initfini;
-+    _dl_scope_free (old_l_initfini);
- 
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
- 
-   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
-     {
--      /* Remove all additional names added to the objects.  */
-       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- 	{
- 	  struct libname_list *lnp = l->l_libname->next;
- 
- 	  l->l_libname->next = NULL;
- 
-+	  /* Remove all additional names added to the objects.  */
- 	  while (lnp != NULL)
- 	    {
- 	      struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- 	      if (! old->dont_free)
- 		free (old);
- 	    }
-+
-+	  /* Free the initfini dependency list.  */
-+	  if (l->l_free_initfini)
-+	    free (l->l_initfini);
- 	}
- 
-       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 	      lnp->dont_free = 1;
- 	      lnp = lnp->next;
- 	    }
-+	  l->l_free_initfini = 0;
- 
- 	  if (l != &GL(dl_rtld_map))
- 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
-    loaded ELF shared objects.
--   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- 						 during LD_TRACE_PRELINKING=1
- 						 contains any DT_SYMBOLIC
- 						 libraries.  */
-+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+				       freed, ie. not allocated with
-+				       the dummy malloc in ld.so.  */
- 
-     /* Collected information about own RPATH directories.  */
-     struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
- 
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
--    /* The init and fini list generated at startup, saved when the
--       object is also loaded dynamically.  */
--    struct link_map **l_orig_initfini;
- 
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- 				    des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir	:= nis
- 
- aux			:= nis_hash
- 
-+headers			:= $(wildcard rpcsvc/*.[hx])
- distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
--			   nisplus-parser.h nis_xdr.h nss \
--			   $(wildcard rpcsvc/*.[hx])
-+			   nisplus-parser.h nis_xdr.h nss
- 
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
--- 
-1.7.5.4
-
diff --git a/testing/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/testing/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
deleted file mode 100644
index 6f0a0398f..000000000
--- a/testing/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 947c651..abccd4a 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
- 		 * copy without '.' if present.
- 		 */
- 		n = strlen(name);
--		if (n >= MAXDNAME) {
-+
-+		/* Decrement N prior to checking it against MAXDNAME
-+		   so that we detect a wrap to SIZE_MAX and return
-+		   a reasonable error.  */
-+		n--;
-+		if (n >= MAXDNAME - 1) {
- 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
- 			return (-1);
- 		}
--		n--;
--		if (n >= 0 && name[n] == '.') {
-+		if (name[n] == '.') {
- 			strncpy(nbuf, name, n);
- 			nbuf[n] = '\0';
- 		} else
diff --git a/testing/glibc/glibc-2.15-arena.patch b/testing/glibc/glibc-2.15-arena.patch
deleted file mode 100644
index 46f52e98d..000000000
--- a/testing/glibc/glibc-2.15-arena.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/malloc/arena.c b/malloc/arena.c
-index d3cf4b9..b1c9469 100644
---- a/malloc/arena.c
-+++ b/malloc/arena.c
-@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
- 	{
- 	  if (mp_.arena_max != 0)
- 	    narenas_limit = mp_.arena_max;
--	  else
-+	  else if (narenas > mp_.arena_test)
- 	    {
- 	      int n  = __get_nprocs ();
- 
-@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
- 	}
-     repeat:;
-       size_t n = narenas;
--      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
-+      /* NB: the following depends on the fact that (size_t)0 - 1 is a
-+	 very large number and that the underflow is OK.  If arena_max
-+	 is set the value of arena_test is irrelevant.  If arena_test
-+	 is set but narenas is not yet larger or equal to arena_test
-+	 narenas_limit is 0.  There is no possibility for narenas to
-+	 be too big for the test to always fail since there is not
-+	 enough address space to create that many arenas.  */
-+      if (__builtin_expect (n <= narenas_limit - 1, 0))
- 	{
- 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
- 	    goto repeat;
diff --git a/testing/glibc/glibc-2.15-avx.patch b/testing/glibc/glibc-2.15-avx.patch
deleted file mode 100644
index 5439da8d0..000000000
--- a/testing/glibc/glibc-2.15-avx.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-index 6867c6e..3a615fc 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-@@ -14,7 +14,7 @@ extern double __ieee754_atan2_fma4 (double, double);
- 
- libm_ifunc (__ieee754_atan2,
- 	    HAS_FMA4 ? __ieee754_atan2_fma4
--	    : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
- strong_alias (__ieee754_atan2, __atan2_finite)
- 
- # define __ieee754_atan2 __ieee754_atan2_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-index 3c65028..7b2320a 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_exp.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-@@ -14,7 +14,7 @@ extern double __ieee754_exp_fma4 (double);
- 
- libm_ifunc (__ieee754_exp,
- 	    HAS_FMA4 ? __ieee754_exp_fma4
--	    : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2));
- strong_alias (__ieee754_exp, __exp_finite)
- 
- # define __ieee754_exp __ieee754_exp_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c
-index 3b468d0..ab277d6 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_log.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_log.c
-@@ -14,7 +14,7 @@ extern double __ieee754_log_fma4 (double);
- 
- libm_ifunc (__ieee754_log,
- 	    HAS_FMA4 ? __ieee754_log_fma4
--	    : (HAS_AVX ? __ieee754_log_avx
-+	    : (HAS_YMM_USABLE ? __ieee754_log_avx
- 	       : __ieee754_log_sse2));
- strong_alias (__ieee754_log, __log_finite)
- 
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-index 3160201..78c7e09 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_atan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-@@ -12,7 +12,8 @@ extern double __atan_fma4 (double);
- #  define __atan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (atan, HAS_FMA4 ? __atan_fma4 : HAS_AVX ? __atan_avx : __atan_sse2);
-+libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 :
-+		   HAS_YMM_USABLE ? __atan_avx : __atan_sse2));
- 
- # define atan __atan_sse2
- #endif
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-index 1ba9dbc..417acd0 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-@@ -17,10 +17,12 @@ extern double __sin_fma4 (double);
- #  define __sin_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
-+libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 :
-+		    HAS_YMM_USABLE ? __cos_avx : __cos_sse2));
- weak_alias (__cos, cos)
- 
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
-+libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 :
-+		    HAS_YMM_USABLE ? __sin_avx : __sin_sse2));
- weak_alias (__sin, sin)
- 
- # define __cos __cos_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-index 8f6601e..3047155 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-@@ -12,7 +12,8 @@ extern double __tan_fma4 (double);
- #  define __tan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
-+libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 :
-+		  HAS_YMM_USABLE ? __tan_avx : __tan_sse2));
- 
- # define tan __tan_sse2
- #endif
-diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
-index 65b0ee9..76d146c 100644
---- a/sysdeps/x86_64/multiarch/init-arch.c
-+++ b/sysdeps/x86_64/multiarch/init-arch.c
-@@ -1,6 +1,6 @@
- /* Initialize CPU feature data.
-    This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    Contributed by Ulrich Drepper <drepper@redhat.com>.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -144,6 +144,18 @@ __init_cpu_features (void)
-   else
-     kind = arch_kind_other;
- 
-+  if (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_AVX)
-+    {
-+      /* Reset the AVX bit in case OSXSAVE is disabled.  */
-+      if ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_OSXSAVE) != 0
-+	  && ({ unsigned int xcrlow;
-+		unsigned int xcrhigh;
-+		asm ("xgetbv"
-+		     : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
-+		(xcrlow & 6) == 6; }))
-+	__cpu_features.feature[index_YMM_Usable] |= bit_YMM_Usable;
-+    }
-+
-   __cpu_features.family = family;
-   __cpu_features.model = model;
-   atomic_write_barrier ();
-diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
-index 2a1df39..2dc75ab 100644
---- a/sysdeps/x86_64/multiarch/init-arch.h
-+++ b/sysdeps/x86_64/multiarch/init-arch.h
-@@ -1,5 +1,5 @@
- /* This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-@@ -22,11 +22,13 @@
- #define bit_Prefer_SSE_for_memop	(1 << 3)
- #define bit_Fast_Unaligned_Load		(1 << 4)
- #define bit_Prefer_PMINUB_for_stringop	(1 << 5)
-+#define bit_YMM_Usable			(1 << 6)
- 
- #define bit_SSE2	(1 << 26)
- #define bit_SSSE3	(1 << 9)
- #define bit_SSE4_1	(1 << 19)
- #define bit_SSE4_2	(1 << 20)
-+#define bit_OSXSAVE	(1 << 27)
- #define bit_AVX		(1 << 28)
- #define bit_POPCOUNT	(1 << 23)
- #define bit_FMA		(1 << 12)
-@@ -48,6 +50,7 @@
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
-+# define index_YMM_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- 
- #else	/* __ASSEMBLER__ */
- 
-@@ -92,7 +95,7 @@ extern struct cpu_features
- 
- 
- extern void __init_cpu_features (void) attribute_hidden;
--#define INIT_ARCH()\
-+# define INIT_ARCH() \
-   do							\
-     if (__cpu_features.kind == arch_kind_unknown)	\
-       __init_cpu_features ();				\
-@@ -125,23 +128,21 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define index_Slow_BSF			FEATURE_INDEX_1
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1
-+# define index_YMM_Usable		FEATURE_INDEX_1
- 
--#define HAS_ARCH_FEATURE(idx, bit) \
--  ((__get_cpu_features ()->feature[idx] & (bit)) != 0)
-+# define HAS_ARCH_FEATURE(name) \
-+  ((__get_cpu_features ()->feature[index_##name] & (bit_##name)) != 0)
- 
--#define HAS_FAST_REP_STRING \
--  HAS_ARCH_FEATURE (index_Fast_Rep_String, bit_Fast_Rep_String)
-+# define HAS_FAST_REP_STRING	HAS_ARCH_FEATURE (Fast_Rep_String)
- 
--#define HAS_FAST_COPY_BACKWARD \
--  HAS_ARCH_FEATURE (index_Fast_Copy_Backward, bit_Fast_Copy_Backward)
-+# define HAS_FAST_COPY_BACKWARD	HAS_ARCH_FEATURE (Fast_Copy_Backward)
- 
--#define HAS_SLOW_BSF \
--  HAS_ARCH_FEATURE (index_Slow_BSF, bit_Slow_BSF)
-+# define HAS_SLOW_BSF		HAS_ARCH_FEATURE (Slow_BSF)
- 
--#define HAS_PREFER_SSE_FOR_MEMOP \
--  HAS_ARCH_FEATURE (index_Prefer_SSE_for_memop, bit_Prefer_SSE_for_memop)
-+# define HAS_PREFER_SSE_FOR_MEMOP HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
- 
--#define HAS_FAST_UNALIGNED_LOAD \
--  HAS_ARCH_FEATURE (index_Fast_Unaligned_Load, bit_Fast_Unaligned_Load)
-+# define HAS_FAST_UNALIGNED_LOAD HAS_ARCH_FEATURE (Fast_Unaligned_Load)
-+
-+# define HAS_YMM_USABLE		HAS_ARCH_FEATURE (YMM_Usable)
- 
- #endif	/* __ASSEMBLER__ */
--- 
-1.7.9
-
diff --git a/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch b/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch
deleted file mode 100644
index 483b28532..000000000
--- a/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff --git a/posix/confstr.c b/posix/confstr.c
-index 3c9566d..cad6561 100644
---- a/posix/confstr.c
-+++ b/posix/confstr.c
-@@ -35,6 +34,10 @@ confstr (name, buf, len)
-   const char *string = "";
-   size_t string_len = 1;
- 
-+  /* Note that this buffer must be large enough for the longest strings
-+     used below.  */
-+  char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
-+
-   switch (name)
-     {
-     case _CS_PATH:
-@@ -53,59 +56,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V7_ILP32_OFF32
--	if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
--		    sizeof "POSIX_V7_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
-+		  sizeof "POSIX_V7_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_ILP32_OFFBIG
--	if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
--		    sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
-+		  sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LP64_OFF64
--	if (__sysconf (_SC_V7_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V7_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
--		    sizeof "POSIX_V7_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
-+		  sizeof "POSIX_V7_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LPBIG_OFFBIG
--	if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
--		    sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V6_WIDTH_RESTRICTED_ENVS:
-@@ -116,59 +115,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V6_ILP32_OFF32
--	if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
--		    sizeof "POSIX_V6_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
-+		  sizeof "POSIX_V6_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_ILP32_OFFBIG
--	if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
--		    sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
-+		  sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LP64_OFF64
--	if (__sysconf (_SC_V6_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V6_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
--		    sizeof "POSIX_V6_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
-+		  sizeof "POSIX_V6_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LPBIG_OFFBIG
--	if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
--		    sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V5_WIDTH_RESTRICTED_ENVS:
-@@ -179,59 +174,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _XBS5_ILP32_OFF32
--	if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
--		    sizeof "XBS5_ILP32_OFF32" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
-+		  sizeof "XBS5_ILP32_OFF32" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _XBS5_ILP32_OFFBIG
--	if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
--		    sizeof "XBS5_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
-+		  sizeof "XBS5_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _XBS5_LP64_OFF64
--	if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
- #endif
- #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
--		    sizeof "XBS5_LP64_OFF64" - 1);
--	    string_len += sizeof "XBS5_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
-+		  sizeof "XBS5_LP64_OFF64" - 1);
-+	  string_len += sizeof "XBS5_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _XBS5_LPBIG_OFFBIG
--	if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
--		    sizeof "XBS5_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
-+		  sizeof "XBS5_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_XBS5_ILP32_OFF32_CFLAGS:
diff --git a/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch
deleted file mode 100644
index d28237f85..000000000
--- a/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index 00bfba6..9e55a6a 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -45,7 +45,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- CPPFLAGS-zic = -DNOT_IN_libc
- 
- ifeq ($(have-ksh),yes)
--install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
- generated += tzselect
- endif
-@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- 	    -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
- 	chmod 555 $@.new
- 	mv -f $@.new $@
--
--$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \
--    $(inst_zonedir)/%: % $(+force)
--	$(do-install)
diff --git a/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch b/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch
deleted file mode 100644
index e4f29bc1a..000000000
--- a/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index e8fb716..d5ea538 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -1,4 +1,4 @@
--# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2000,2002,2005,2007,2012 Free Software Foundation, Inc.
- # This file is part of the GNU C Library.
- 
- # The GNU C Library is free software; you can redistribute it and/or
-@@ -49,33 +49,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- 
- CPPFLAGS-zic = -DNOT_IN_libc
- 
--# z.* use this variable.
--define nl
--
--
--endef
--ifndef avoid-generated
--ifndef inhibit_timezone_rules
---include $(addprefix $(objpfx)z.,$(tzfiles))
--endif
--endif
--
--# Make these absolute file names.
--installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \
--					$(addprefix $(inst_zonedir)/, \
--						    $(localtime-file)))
--installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \
--					 $(addprefix $(inst_zonedir)/, \
--						     $(posixrules-file)))
--
--ifeq ($(cross-compiling),no)
--# Don't try to install the zoneinfo files since we can't run zic.
--install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
--					      $(zonenames:%=posix/%) \
--					      $(zonenames:%=right/%)) \
--		 $(installed-localtime-file) $(installed-posixrules-file)
--endif
--
- ifeq ($(have-ksh),yes)
- install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
-@@ -85,79 +58,6 @@ endif
- include ../Rules
- 
- 
--$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
--# Kludge alert: we use an implicit rule (in what we are generating here)
--# because that is the only way to tell Make that the one command builds all
--# the files.
--# The extra kludge for the $(tzlinks) files is necessary since running zic
--# this file requires all other files to exist.  Blech!
--	$(make-target-directory)
--	(echo 'define $*-zones'						    ;\
--	 $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\
--	 echo 'endef'							    ;\
--	 echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))'		    ;\
--	 echo 'ifdef $*-zones'						    ;\
--	 if test x$(findstring $*, $(tzlinks)) != x; then		     \
--	   echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \'	    ;\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\
--	 fi								    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic leapseconds yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic /dev/null yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic $$(leapseconds) yearistype'		    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo 'endif'							    ;\
--	 echo 'zonenames := $$(zonenames) $$($*-zones)'			    ;\
--	) > $@.new
--	mv $@.new $@
--
--.PHONY: echo-zonenames
--echo-zonenames:
--	@echo 'Known zones: $(zonenames)'
--
--
--# We have to use `-d $(inst_zonedir)' to explictly tell zic where to
--# place the output files although $(zonedir) is compiled in.  But the
--# user might have set $(install_root) on the command line of `make install'.
--zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
--tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
--	    -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
--
--# The source files specify the zone names relative to the -d directory,
--# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix
--# and the like.  This magic extracts /posix or /right if it's the first
--# component after $(inst_zonedir) in the target name $@.
--target-zone-flavor = $(filter /posix /right, \
--			      /$(firstword $(subst /, , \
--					  $(patsubst $(inst_zonedir)/%,%,$@))))
--
--ifdef localtime
--$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \
--			     $(+force)
--	$(make-target-directory)
--	if test -r $@; then \
--	  echo Site timezone NOT reset to Factory.; \
--	else \
--	  rm -f $@T; \
--	  $(SHELL) $(..)scripts/rellns-sh $< $@T; \
--	  mv -f $@T $@; \
--	fi
--endif
--ifdef posixrules
--$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \
--			      $(+force)
--	$(zic-cmd) -p $(posixrules)
--endif
--
--
- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
- 
- tz-cflags = -DTZDIR='"$(zonedir)"' \
diff --git a/testing/glibc/glibc-2.15-feraiseexcept-plt.patch b/testing/glibc/glibc-2.15-feraiseexcept-plt.patch
deleted file mode 100644
index c41acc169..000000000
--- a/testing/glibc/glibc-2.15-feraiseexcept-plt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
-index 70f9ee2..6e2ce35 100644
---- a/sysdeps/i386/fpu/feupdateenv.c
-+++ b/sysdeps/i386/fpu/feupdateenv.c
-@@ -1,5 +1,5 @@
- /* Install given floating-point environment and raise exceptions.
--   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
-+   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
- 
-@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
-   /* Raise the saved exception.  Incidently for us the implementation
-      defined format of the values in objects of type fexcept_t is the
-      same as the ones specified using the FE_* constants.  */
--  feraiseexcept ((int) temp);
-+  __feraiseexcept ((int) temp);
- 
-   /* Success.  */
-   return 0;
diff --git a/testing/glibc/glibc-2.15-fix-res_query-assert.patch b/testing/glibc/glibc-2.15-fix-res_query-assert.patch
deleted file mode 100644
index a894da9c7..000000000
--- a/testing/glibc/glibc-2.15-fix-res_query-assert.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/resolv/res_query.c	
-+++ a/resolv/res_query.c	
-@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
- 		  int *resplen2)
- {
- 	HEADER *hp = (HEADER *) answer;
-+	HEADER *hp2;
- 	int n, use_malloc = 0;
- 	u_int oflags = statp->_flags;
- 
-@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
- 	  /* __libc_res_nsend might have reallocated the buffer.  */
- 	  hp = (HEADER *) *answerp;
- 
--	/* We simplify the following tests by assigning HP to HP2.  It
--	   is easy to verify that this is the same as ignoring all
--	   tests of HP2.  */
--	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
--
--	if (n < (int) sizeof (HEADER) && answerp2 != NULL
--	    && *resplen2 > (int) sizeof (HEADER))
-+	/* We simplify the following tests by assigning HP to HP2 or
-+	   vice versa.  It is easy to verify that this is the same as
-+	   ignoring all tests of HP or HP2.  */
-+	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp = hp2;
-+	    hp2 = hp;
- 	  }
--	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
--		 && n > (int) sizeof (HEADER))
-+	else
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp2 = hp;
-+	    hp2 = (HEADER *) *answerp2;
-+	    if (n < (int) sizeof (HEADER))
-+	      {
-+	        hp = hp2;
-+	      }
- 	  }
- 
-+	/* Make sure both hp and hp2 are defined */
-+	assert((hp != NULL) && (hp2 != NULL));
-+
- 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
- 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
- #ifdef DEBUG
diff --git a/testing/glibc/glibc-2.15-fmtmsg-locking.patch b/testing/glibc/glibc-2.15-fmtmsg-locking.patch
deleted file mode 100644
index f5976abd9..000000000
--- a/testing/glibc/glibc-2.15-fmtmsg-locking.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
-index 9203317..4c02302 100644
---- a/stdlib/fmtmsg.c
-+++ b/stdlib/fmtmsg.c
-@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	const char *text, const char *action, const char *tag)
- {
-   __libc_once_define (static, once);
--  int result = MM_OK;
-   struct severity_info *severity_rec;
- 
-   /* Make sure everything is initialized.  */
-@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	return MM_NOTOK;
-     }
- 
--  for (severity_rec = severity_list; severity_rec != NULL;
--       severity_rec = severity_rec->next)
--    if (severity == severity_rec->severity)
--      /* Bingo.  */
--      break;
--
--  /* If we don't know anything about the severity level return an error.  */
--  if (severity_rec == NULL)
--    return MM_NOTOK;
--
--
- #ifdef __libc_ptf_call
-   /* We do not want this call to be cut short by a thread
-      cancellation.  Therefore disable cancellation for now.  */
-@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
- 		   0);
- #endif
- 
--  /* Now we can print.  */
--  if (classification & MM_PRINT)
--    {
--      int do_label = (print & label_mask) && label != MM_NULLLBL;
--      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
--      int do_text = (print & text_mask) && text != MM_NULLTXT;
--      int do_action = (print & action_mask) && action != MM_NULLACT;
--      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
--
--      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
--		      do_label ? label : "",
--		      do_label && (do_severity | do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_severity ? severity_rec->string : "",
--		      do_severity && (do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_text ? text : "",
--		      do_text && (do_action | do_tag) ? "\n" : "",
--		      do_action ? "TO FIX: " : "",
--		      do_action ? action : "",
--		      do_action && do_tag ? "  " : "",
--		      do_tag ? tag : "") < 0)
--	/* Oh, oh.  An error occurred during the output.  */
--	result = MM_NOMSG;
--    }
-+  __libc_lock_lock (lock);
- 
--  if (classification & MM_CONSOLE)
-+  for (severity_rec = severity_list; severity_rec != NULL;
-+       severity_rec = severity_rec->next)
-+    if (severity == severity_rec->severity)
-+      /* Bingo.  */
-+      break;
-+
-+  /* If we don't know anything about the severity level return an error.  */
-+  int result = MM_NOTOK;
-+  if (severity_rec != NULL)
-     {
--      int do_label = label != MM_NULLLBL;
--      int do_severity = severity != MM_NULLSEV;
--      int do_text = text != MM_NULLTXT;
--      int do_action = action != MM_NULLACT;
--      int do_tag = tag != MM_NULLTAG;
--
--      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
--	      do_label ? label : "",
--	      do_label && (do_severity | do_text | do_action | do_tag)
--	      ? ": " : "",
--	      do_severity ? severity_rec->string : "",
--	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
--	      do_text ? text : "",
--	      do_text && (do_action | do_tag) ? "\n" : "",
--	      do_action ? "TO FIX: " : "",
--	      do_action ? action : "",
--	      do_action && do_tag ? "  " : "",
--	      do_tag ? tag : "");
-+      result = MM_OK;
-+
-+      /* Now we can print.  */
-+      if (classification & MM_PRINT)
-+	{
-+	  int do_label = (print & label_mask) && label != MM_NULLLBL;
-+	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
-+	  int do_text = (print & text_mask) && text != MM_NULLTXT;
-+	  int do_action = (print & action_mask) && action != MM_NULLACT;
-+	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
-+			  do_label ? label : "",
-+			  need_colon ? ": " : "",
-+			  do_severity ? severity_rec->string : "",
-+			  do_severity && (do_text | do_action | do_tag)
-+			  ? ": " : "",
-+			  do_text ? text : "",
-+			  do_text && (do_action | do_tag) ? "\n" : "",
-+			  do_action ? "TO FIX: " : "",
-+			  do_action ? action : "",
-+			  do_action && do_tag ? "  " : "",
-+			  do_tag ? tag : "") < 0)
-+	    /* Oh, oh.  An error occurred during the output.  */
-+	    result = MM_NOMSG;
-+	}
-+
-+      if (classification & MM_CONSOLE)
-+	{
-+	  int do_label = label != MM_NULLLBL;
-+	  int do_severity = severity != MM_NULLSEV;
-+	  int do_text = text != MM_NULLTXT;
-+	  int do_action = action != MM_NULLACT;
-+	  int do_tag = tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
-+		  do_label ? label : "",
-+		  need_colon ? ": " : "",
-+		  do_severity ? severity_rec->string : "",
-+		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
-+		  do_text ? text : "",
-+		  do_text && (do_action | do_tag) ? "\n" : "",
-+		  do_action ? "TO FIX: " : "",
-+		  do_action ? action : "",
-+		  do_action && do_tag ? "  " : "",
-+		  do_tag ? tag : "");
-+	}
-     }
- 
-+  __libc_lock_unlock (lock);
-+
- #ifdef __libc_ptf_call
-   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
- #endif
diff --git a/testing/glibc/glibc-2.15-gb18030.patch.gz b/testing/glibc/glibc-2.15-gb18030.patch.gz
deleted file mode 100644
index dde59c056..000000000
--- a/testing/glibc/glibc-2.15-gb18030.patch.gz
+++ /dev/null
diff --git a/testing/glibc/glibc-2.15-ifunc.patch b/testing/glibc/glibc-2.15-ifunc.patch
deleted file mode 100644
index 115afa02a..000000000
--- a/testing/glibc/glibc-2.15-ifunc.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff --git a/Makeconfig b/Makeconfig
-index 2db2821..68547b2 100644
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -900,6 +900,12 @@ else
- libdl = $(common-objpfx)dlfcn/libdl.a
- endif
- 
-+ifeq ($(build-shared),yes)
-+libm = $(common-objpfx)math/libm.so$(libm.so-version)
-+else
-+libm = $(common-objpfx)math/libm.a
-+endif
-+
- # These are the subdirectories containing the library source.  The order
- # is more or less arbitrary.  The sorting step will take care of the
- # dependencies.
-diff --git a/elf/Makefile b/elf/Makefile
-index 052e763..3f1772a 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -124,7 +124,8 @@ distribute	:= rtld-Rules \
- 		   tst-initordera1.c tst-initordera2.c tst-initorderb1.c \
- 		   tst-initorderb2.c tst-initordera3.c tst-initordera4.c \
- 		   tst-initorder.c \
--		   tst-initorder2.c
-+		   tst-initorder2.c \
-+		   tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c
- 
- CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
- CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
-@@ -227,7 +228,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- 	 tst-audit1 tst-audit2 \
- 	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
--	 tst-initorder tst-initorder2
-+	 tst-initorder tst-initorder2 tst-relsort1
- #	 reldep9
- test-srcs = tst-pathopt
- selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
-@@ -290,7 +291,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
- 		tst-initordera1 tst-initorderb1 \
- 		tst-initordera2 tst-initorderb2 \
- 		tst-initordera3 tst-initordera4 \
--		tst-initorder2a tst-initorder2b tst-initorder2c tst-initorder2d
-+		tst-initorder2a tst-initorder2b tst-initorder2c \
-+		tst-initorder2d \
-+		tst-relsort1mod1 tst-relsort1mod2
- ifeq (yes,$(have-initfini-array))
- modules-names += tst-array2dep tst-array5dep
- endif
-@@ -1195,3 +1198,9 @@ CFLAGS-tst-auditmod6b.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod6c.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod7b.c += $(AVX-CFLAGS)
- endif
-+
-+$(objpfx)tst-relsort1: $(libdl)
-+$(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
-+$(objpfx)tst-relsort1mod2.so: $(libm)
-+$(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
-+			   $(objpfx)tst-relsort1mod2.so
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index a0b5c50..a56bdc1 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -1,5 +1,5 @@
- /* Load a shared object at runtime, relocate it, and run its initializer.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -302,45 +302,109 @@ dl_open_worker (void *a)
-   if (GLRO(dl_lazy))
-     reloc_mode |= mode & RTLD_LAZY;
- 
--  /* Relocate the objects loaded.  We do this in reverse order so that copy
--     relocs of earlier objects overwrite the data written by later objects.  */
--
-+  /* Sort the objects by dependency for the relocation process.  This
-+     allows IFUNC relocations to work and it also means copy
-+     relocation of dependencies are if necessary overwritten.  */
-+  size_t nmaps = 0;
-   struct link_map *l = new;
--  while (l->l_next)
--    l = l->l_next;
--  while (1)
-+  do
-+    {
-+      if (! l->l_real->l_relocated)
-+	++nmaps;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  struct link_map *maps[nmaps];
-+  nmaps = 0;
-+  l = new;
-+  do
-     {
-       if (! l->l_real->l_relocated)
-+	maps[nmaps++] = l;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  if (nmaps > 1)
-+    {
-+      char seen[nmaps];
-+      memset (seen, '\0', nmaps);
-+      size_t i = 0;
-+      while (1)
- 	{
--#ifdef SHARED
--	  if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	  ++seen[i];
-+	  struct link_map *thisp = maps[i];
-+
-+	  /* Find the last object in the list for which the current one is
-+	     a dependency and move the current object behind the object
-+	     with the dependency.  */
-+	  size_t k = nmaps - 1;
-+	  while (k > i)
- 	    {
--	      /* If this here is the shared object which we want to profile
--		 make sure the profile is started.  We can find out whether
--		 this is necessary or not by observing the `_dl_profile_map'
--		 variable.  If was NULL but is not NULL afterwars we must
--		 start the profiling.  */
--	      struct link_map *old_profile_map = GL(dl_profile_map);
-+	      struct link_map **runp = maps[k]->l_initfini;
-+	      if (runp != NULL)
-+		/* Look through the dependencies of the object.  */
-+		while (*runp != NULL)
-+		  if (__builtin_expect (*runp++ == thisp, 0))
-+		    {
-+		      /* Move the current object to the back past the last
-+			 object with it as the dependency.  */
-+		      memmove (&maps[i], &maps[i + 1],
-+			       (k - i) * sizeof (maps[0]));
-+		      maps[k] = thisp;
-+
-+		      if (seen[i + 1] > 1)
-+			{
-+			  ++i;
-+			  goto next_clear;
-+			}
-+
-+		      char this_seen = seen[i];
-+		      memmove (&seen[i], &seen[i + 1],
-+			       (k - i) * sizeof (seen[0]));
-+		      seen[k] = this_seen;
-+
-+		      goto next;
-+		    }
-+
-+	      --k;
-+	    }
- 
--	      _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+	  if (++i == nmaps)
-+	    break;
-+	next_clear:
-+	  memset (&seen[i], 0, (nmaps - i) * sizeof (seen[0]));
-+	next:;
-+	}
-+    }
- 
--	      if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
--		{
--		  /* We must prepare the profiling.  */
--		  _dl_start_profile ();
-+  for (size_t i = nmaps; i-- > 0; )
-+    {
-+      l = maps[i];
- 
--		  /* Prevent unloading the object.  */
--		  GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
--		}
-+#ifdef SHARED
-+      if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	{
-+	  /* If this here is the shared object which we want to profile
-+	     make sure the profile is started.  We can find out whether
-+	     this is necessary or not by observing the `_dl_profile_map'
-+	     variable.  If it was NULL but is not NULL afterwars we must
-+	     start the profiling.  */
-+	  struct link_map *old_profile_map = GL(dl_profile_map);
-+
-+	  _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+
-+	  if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
-+	    {
-+	      /* We must prepare the profiling.  */
-+	      _dl_start_profile ();
-+
-+	      /* Prevent unloading the object.  */
-+	      GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
- 	    }
--	  else
--#endif
--	    _dl_relocate_object (l, l->l_scope, reloc_mode, 0);
- 	}
--
--      if (l == new)
--	break;
--      l = l->l_prev;
-+      else
-+#endif
-+	_dl_relocate_object (l, l->l_scope, reloc_mode, 0);
-     }
- 
-   /* If the file is not loaded now as a dependency, add the search
-diff --git a/elf/tst-relsort1.c b/elf/tst-relsort1.c
-new file mode 100644
-index 0000000..972100c
---- /dev/null
-+++ b/elf/tst-relsort1.c
-@@ -0,0 +1,19 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+
-+
-+static int
-+do_test ()
-+{
-+  const char lib[] = "$ORIGIN/tst-relsort1mod1.so";
-+  void *h = dlopen (lib, RTLD_NOW);
-+  if (h == NULL)
-+    {
-+      puts (dlerror ());
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/elf/tst-relsort1mod1.c b/elf/tst-relsort1mod1.c
-new file mode 100644
-index 0000000..9e4a943
---- /dev/null
-+++ b/elf/tst-relsort1mod1.c
-@@ -0,0 +1,7 @@
-+extern int foo (double);
-+
-+int
-+bar (void)
-+{
-+  return foo (1.2);
-+}
-diff --git a/elf/tst-relsort1mod2.c b/elf/tst-relsort1mod2.c
-new file mode 100644
-index 0000000..a2c3e55
---- /dev/null
-+++ b/elf/tst-relsort1mod2.c
-@@ -0,0 +1,7 @@
-+#include <math.h>
-+
-+int
-+foo (double d)
-+{
-+  return floor (d) != 0.0;
-+}
diff --git a/testing/glibc/glibc-2.15-lddebug-scopes.patch b/testing/glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/testing/glibc/glibc-2.15-lddebug-scopes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Fri, 7 Oct 2011 09:31:27 +0200
-Subject: [PATCH] Horrible workaround for horribly broken software
-
----
- elf/rtld.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 978c609..8422b9f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	      char *copy = malloc (len);
- 	      if (copy == NULL)
- 		_dl_fatal_printf ("out of memory\n");
--	      l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
-+	      l->l_libname->name = memcpy (copy, dsoname, len);
-+	      if (GLRO(dl_debug_mask))
-+		l->l_name = copy;
- 	    }
- 
- 	  /* Add the vDSO to the object list.  */
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.15-multiarch-x86-strcmp.patch b/testing/glibc/glibc-2.15-multiarch-x86-strcmp.patch
deleted file mode 100644
index 38c9e617f..000000000
--- a/testing/glibc/glibc-2.15-multiarch-x86-strcmp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-index d10e872..d4fcd2b 100644
---- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strcasecmp.c>
- 
-+strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
-index 5410d17..b3b9eb8 100644
---- a/sysdeps/i386/i686/multiarch/strcmp.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp.S
-@@ -111,6 +111,7 @@ END(STRCMP)
- # endif
- #endif
- 
--#ifndef USE_AS_STRNCMP
-+#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
-+    && !defined USE_AS_STRNCASECMP_L
- # include "../strcmp.S"
- #endif
-diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-index 0c68b8d..7e601af 100644
---- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strncase.c>
- 
-+strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
diff --git a/testing/glibc/glibc-2.15-nearbyintf-rounding.patch b/testing/glibc/glibc-2.15-nearbyintf-rounding.patch
deleted file mode 100644
index b2bb9caac..000000000
--- a/testing/glibc/glibc-2.15-nearbyintf-rounding.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index c8186c8..1016753 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -4632,6 +4632,29 @@ nearbyint_test (void)
-   TEST_f_f (nearbyint, 524286.75, 524287.0);
-   TEST_f_f (nearbyint, 524288.75, 524289.0);
- 
-+  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
-+  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
-+  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
-+  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
-+  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
-+  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
-+  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
-+  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
-+  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
-+  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
-+#endif
-+
-   END (nearbyint);
- }
- 
-diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-index 04ef9ab..a6d602b 100644
---- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
-+++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-@@ -30,18 +30,12 @@ __nearbyintf(float x)
- {
- 	fenv_t env;
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		libc_feholdexceptf (&env);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
-@@ -49,17 +43,11 @@ __nearbyintf(float x)
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	libc_feholdexceptf (&env);
- 	w = TWO23[sx]+x;
- 	t = w-TWO23[sx];
diff --git a/testing/glibc/glibc-2.15-negative-result-cache.patch b/testing/glibc/glibc-2.15-negative-result-cache.patch
deleted file mode 100644
index c09e79a17..000000000
--- a/testing/glibc/glibc-2.15-negative-result-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/nscd/aicache.c b/nscd/aicache.c
-index aaaf80d..e1f1244 100644
---- a/nscd/aicache.c
-+++ b/nscd/aicache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -514,8 +514,9 @@ next_nip:
-       if (fd != -1)
- 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
- 
--      /* If we cannot permanently store the result, so be it.  */
--      if (__builtin_expect (db->negtimeout == 0, 0))
-+      /* If we have a transient error or cannot permanently store the
-+	 result, so be it.  */
-+      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	{
- 	  /* Mark the old entry as obsolete.  */
- 	  if (dh != NULL)
-diff --git a/nscd/grpcache.c b/nscd/grpcache.c
-index e9607c6..a698f36 100644
---- a/nscd/grpcache.c
-+++ b/nscd/grpcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for group lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
- 	  else
- 	    written = total;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (db->negtimeout == 0)
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/hstcache.c b/nscd/hstcache.c
-index 4d68ade..c72feaa 100644
---- a/nscd/hstcache.c
-+++ b/nscd/hstcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
- 					MSG_NOSIGNAL)) != total)
- 	    all_written = false;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
-index 4ac9942..2019991 100644
---- a/nscd/initgrcache.c
-+++ b/nscd/initgrcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
-index 49e130c..e2ba09d 100644
---- a/nscd/pwdcache.c
-+++ b/nscd/pwdcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for passwd lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/servicescache.c b/nscd/servicescache.c
-index d3d5dce..a6337e3 100644
---- a/nscd/servicescache.c
-+++ b/nscd/servicescache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for services lookup.
--   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
- 
-@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
diff --git a/testing/glibc/glibc-2.15-non-signalling-comparisons.patch b/testing/glibc/glibc-2.15-non-signalling-comparisons.patch
deleted file mode 100644
index 874f8b4cb..000000000
--- a/testing/glibc/glibc-2.15-non-signalling-comparisons.patch
+++ /dev/null
@@ -1,886 +0,0 @@
-diff --git a/math/w_acos.c b/math/w_acos.c
-index 3138408..0490933 100644
---- a/math/w_acos.c
-+++ b/math/w_acos.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __acos (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosf.c b/math/w_acosf.c
-index 0e41a2c..2500a7d 100644
---- a/math/w_acosf.c
-+++ b/math/w_acosf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __acosf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosh.c b/math/w_acosh.c
-index 0bd2686..d632987 100644
---- a/math/w_acosh.c
-+++ b/math/w_acosh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __acosh (double x)
- {
--  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 29);
- 
-diff --git a/math/w_acoshf.c b/math/w_acoshf.c
-index c59bf94..f77df2b 100644
---- a/math/w_acoshf.c
-+++ b/math/w_acoshf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __acoshf (float x)
- {
--  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard_f (x, x, 129);
- 
-diff --git a/math/w_acoshl.c b/math/w_acoshl.c
-index 819bdfc..cc823b8 100644
---- a/math/w_acoshl.c
-+++ b/math/w_acoshl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __acoshl (long double x)
- {
--  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 229);
- 
-diff --git a/math/w_acosl.c b/math/w_acosl.c
-index 6417068..05023b4 100644
---- a/math/w_acosl.c
-+++ b/math/w_acosl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __acosl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asin.c b/math/w_asin.c
-index d4e89ce..0fa9487 100644
---- a/math/w_asin.c
-+++ b/math/w_asin.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __asin (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinf.c b/math/w_asinf.c
-index 270961f..c28edab 100644
---- a/math/w_asinf.c
-+++ b/math/w_asinf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __asinf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinl.c b/math/w_asinl.c
-index 32e5273..e4036d8 100644
---- a/math/w_asinl.c
-+++ b/math/w_asinl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __asinl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_atanh.c b/math/w_atanh.c
-index 1022bd5..190d2e9 100644
---- a/math/w_atanh.c
-+++ b/math/w_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- double
- __atanh (double x)
- {
--  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabs (x) > 1.0
- 			      ? 30		/* atanh(|x|>1) */
-diff --git a/math/w_atanhf.c b/math/w_atanhf.c
-index 3c8cf83..e0c5dc3 100644
---- a/math/w_atanhf.c
-+++ b/math/w_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- float
- __atanhf (float x)
- {
--  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x,
- 				fabsf (x) > 1.0f
- 				? 130		/* atanh(|x|>1) */
-diff --git a/math/w_atanhl.c b/math/w_atanhl.c
-index f582acf..319535d 100644
---- a/math/w_atanhl.c
-+++ b/math/w_atanhl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- long double
- __atanhl (long double x)
- {
--  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabsl (x) > 1.0L
- 			      ? 230		/* atanh(|x|>1) */
-diff --git a/math/w_exp2.c b/math/w_exp2.c
-index bf22326..7a3b0af 100644
---- a/math/w_exp2.c
-+++ b/math/w_exp2.c
-@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
- double
- __exp2 (double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finite (x))
-     /* exp2 overflow: 44, exp2 underflow: 45 */
-     return __kernel_standard (x, x, 44 + (x <= o_threshold));
-diff --git a/math/w_exp2f.c b/math/w_exp2f.c
-index 7215fca..c4e9e94 100644
---- a/math/w_exp2f.c
-+++ b/math/w_exp2f.c
-@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
- float
- __exp2f (float x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitef (x))
-     /* exp2 overflow: 144, exp2 underflow: 145 */
-     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
-diff --git a/math/w_exp2l.c b/math/w_exp2l.c
-index ac8d231..442a637 100644
---- a/math/w_exp2l.c
-+++ b/math/w_exp2l.c
-@@ -13,7 +13,8 @@ static const long double u_threshold
- long double
- __exp2l (long double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitel (x))
-     /* exp2 overflow: 244, exp2 underflow: 245 */
-     return __kernel_standard (x, x, 244 + (x <= o_threshold));
-diff --git a/math/w_j0.c b/math/w_j0.c
-index 1dff8b4..f8d3724 100644
---- a/math/w_j0.c
-+++ b/math/w_j0.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j0 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 34);
- 
-@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
- double
- y0 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j0f.c b/math/w_j0f.c
-index fc52f26..cef36aa 100644
---- a/math/w_j0f.c
-+++ b/math/w_j0f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- j0f (float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 134);
-@@ -38,7 +38,8 @@ j0f (float x)
- float
- y0f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+                        || isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j0l.c b/math/w_j0l.c
-index 8d72d50..144f33c 100644
---- a/math/w_j0l.c
-+++ b/math/w_j0l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j0l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 234);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
- long double
- __y0l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_j1.c b/math/w_j1.c
-index 358e0e1..e9a5357 100644
---- a/math/w_j1.c
-+++ b/math/w_j1.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j1 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 36);
- 
-@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
- double
- y1 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j1f.c b/math/w_j1f.c
-index 096fdf5..29bd949 100644
---- a/math/w_j1f.c
-+++ b/math/w_j1f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- j1f (float x)
- {
--  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 136);
- 
-@@ -37,7 +38,8 @@ j1f (float x)
- float
- y1f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j1l.c b/math/w_j1l.c
-index 93e4ee4..01b8551 100644
---- a/math/w_j1l.c
-+++ b/math/w_j1l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j1l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 236);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
- long double
- __y1l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_jn.c b/math/w_jn.c
-index f0dd8c6..fd3fb16 100644
---- a/math/w_jn.c
-+++ b/math/w_jn.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- jn (int n, double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard (n, x, 38);
- 
-@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
- double
- yn (int n, double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_jnf.c b/math/w_jnf.c
-index ef29eb4..36d6f6d 100644
---- a/math/w_jnf.c
-+++ b/math/w_jnf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- jnf (int n, float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard_f (n, x, 138);
-@@ -38,7 +38,8 @@ jnf (int n, float x)
- float
- ynf (int n, float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_log.c b/math/w_log.c
-index efc1c4c..ec33605 100644
---- a/math/w_log.c
-+++ b/math/w_log.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10.c b/math/w_log10.c
-index 2717ade..fe799ad 100644
---- a/math/w_log10.c
-+++ b/math/w_log10.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log10 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10f.c b/math/w_log10f.c
-index 60737ca..4b821f7 100644
---- a/math/w_log10f.c
-+++ b/math/w_log10f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log10f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_log10l.c b/math/w_log10l.c
-index b26f18c..0e5a137 100644
---- a/math/w_log10l.c
-+++ b/math/w_log10l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log10l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_log2.c b/math/w_log2.c
-index 998e5d9..e58e109 100644
---- a/math/w_log2.c
-+++ b/math/w_log2.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log2 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2f.c b/math/w_log2f.c
-index 6d91bf4..6963ed2 100644
---- a/math/w_log2f.c
-+++ b/math/w_log2f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log2f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2l.c b/math/w_log2l.c
-index e51c1bc..eed04ff6c 100644
---- a/math/w_log2l.c
-+++ b/math/w_log2l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log2l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_logf.c b/math/w_logf.c
-index 8aa27c8..38d408f 100644
---- a/math/w_logf.c
-+++ b/math/w_logf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __logf (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_logl.c b/math/w_logl.c
-index a3139ff..593b37d 100644
---- a/math/w_logl.c
-+++ b/math/w_logl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __logl (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_sqrt.c b/math/w_sqrt.c
-index 409a6df..f6ba542 100644
---- a/math/w_sqrt.c
-+++ b/math/w_sqrt.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __sqrt (double x)
- {
--  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 26); /* sqrt(negative) */
- 
-   return __ieee754_sqrt (x);
-diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
-index 3c3d2f8..c128e9b 100644
---- a/math/w_sqrtf.c
-+++ b/math/w_sqrtf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __sqrtf (float x)
- {
--  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
- 
-   return __ieee754_sqrtf (x);
-diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
-index 5e18f44..2a4a048 100644
---- a/math/w_sqrtl.c
-+++ b/math/w_sqrtl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __sqrtl (long double x)
- {
--  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 226); /* sqrt(negative) */
- 
-   return __ieee754_sqrtl (x);
-diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
-index 9fc21ab..5f471b1 100644
---- a/sysdeps/ieee754/dbl-64/e_atanh.c
-+++ b/sysdeps/ieee754/dbl-64/e_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
- {
-   double xa = fabs (x);
-   double t;
--  if (xa < 0.5)
-+  if (isless (xa, 0.5))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
-       t = xa + xa;
-       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
-     }
--  else if (__builtin_expect (xa < 1.0, 1))
-+  else if (__builtin_expect (isless (xa, 1.0), 1))
-     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
-   else
-     {
--      if (xa > 1.0)
-+      if (isgreater (xa, 1.0))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0;
-diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
-index ee42587..b584ed8 100644
---- a/sysdeps/ieee754/dbl-64/w_exp.c
-+++ b/sysdeps/ieee754/dbl-64/w_exp.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
- double
- __exp (double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 6);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 7);
-diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
-index 75ed691..7af2f6c 100644
---- a/sysdeps/ieee754/flt-32/e_atanhf.c
-+++ b/sysdeps/ieee754/flt-32/e_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
- {
-   float xa = fabsf (x);
-   float t;
--  if (xa < 0.5f)
-+  if (isless (xa, 0.5f))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28f, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
-       t = xa + xa;
-       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
-     }
--  else if (__builtin_expect (xa < 1.0f, 1))
-+  else if (__builtin_expect (isless (xa, 1.0f), 1))
-     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
-   else
-     {
--      if (xa > 1.0f)
-+      if (isgreater (xa, 1.0f))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0f;
-diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
-index 5500872..bc3b2f6 100644
---- a/sysdeps/ieee754/flt-32/w_expf.c
-+++ b/sysdeps/ieee754/flt-32/w_expf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
- float
- __expf (float x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 106);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 107);
-diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
-index ec9d8a7..d61c0a3 100644
---- a/sysdeps/ieee754/ldbl-96/w_expl.c
-+++ b/sysdeps/ieee754/ldbl-96/w_expl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
- long double
- __expl (long double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 206);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 207);
diff --git a/testing/glibc/glibc-2.15-regex.patch b/testing/glibc/glibc-2.15-regex.patch
deleted file mode 100644
index 6385f2c08..000000000
--- a/testing/glibc/glibc-2.15-regex.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/posix/regex_internal.c b/posix/regex_internal.c
-index bc19243..124f8cc 100644
---- a/posix/regex_internal.c
-+++ b/posix/regex_internal.c
-@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx)
- }
- 
- static unsigned char
--internal_function __attribute ((pure))
-+internal_function
- re_string_fetch_byte_case (re_string_t *pstr)
- {
-   if (BE (!pstr->mbs_allocated, 1))
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.15-revert-c5a0802a.patch b/testing/glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index d8894723a..000000000
--- a/testing/glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:12.937212834 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:42.104222278 +0000
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	18f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- 	movl	%ebp, %edx
- 	xorl	%esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
- 	sete	16(%esp)
- 	je	19f
- 
--	cmpl	$-EAGAIN, %eax
--	je	91f
--
- 	/* Normal and PI futexes dont mix. Use normal futex functions only
- 	   if the kernel does not support the PI futex functions.  */
- 	cmpl	$-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
- 	call	__lll_unlock_wake
- 	jmp	11b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--
--	/* Get internal lock.  */
--	movl	$1, %edx
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %edx, (%ebx)
--#else
--	cmpxchgl %edx, cond_lock(%ebx)
--#endif
--	jz	92f
--
--#if cond_lock == 0
--	movl	%ebx, %edx
--#else
--	leal	cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_lock_wait
--
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	addl	$1, cond_futex(%ebx)
--	movl	cond_futex(%ebx), %ebp
--
--	/* Unlock.  */
--	LOCK
--#if cond_lock == 0
--	subl	$1, (%ebx)
--#else
--	subl	$1, cond_lock(%ebx)
--#endif
--	je	93f
--#if cond_lock == 0
--	movl	%ebx, %eax
--#else
--	leal	cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_unlock_wake
--
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorl	%ecx, %ecx
--	movl	dep_mutex(%ebx), %edi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -642,10 +566,6 @@ __condvar_w_cleanup:
- 	.long	.LcleanupEND-.Lsub_cond_futex
- 	.long	__condvar_w_cleanup-.LSTARTCODE
- 	.uleb128  0
--	.long	.LcleanupSTART2-.LSTARTCODE
--	.long	.LcleanupEND2-.LcleanupSTART2
--	.long	__condvar_w_cleanup-.LSTARTCODE
--	.uleb128  0
- 	.long	.LcallUR-.LSTARTCODE
- 	.long	.LENDCODE-.LcallUR
- 	.long	0
-Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
-diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:04:12.941212837 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:05:05.155229737 +0000
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
- #include <stap-probe.h>
- 
- #include <kernel-features.h>
-@@ -137,14 +136,11 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	61f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- 	movl	$SYS_futex, %eax
- 	syscall
- 
- 	movl	$1, %r8d
--	cmpq	$-EAGAIN, %rax
--	je	91f
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
-@@ -331,70 +327,6 @@ __pthread_cond_wait:
- 
- 13:	movq	%r10, %rax
- 	jmp	14b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--	movq	8(%rsp), %rdi
--
--	/* Get internal lock.  */
--	movl	$1, %esi
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %esi, (%rdi)
--#else
--	cmpxchgl %esi, cond_lock(%rdi)
--#endif
--	jz	92f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	callq	__lll_lock_wait
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	incl	cond_futex(%rdi)
--	movl	cond_futex(%rdi), %edx
--
--	/* Release internal lock.  */
--	LOCK
--#if cond_lock == 0
--	decl	(%rdi)
--#else
--	decl	cond_lock(%rdi)
--#endif
--	jz	93f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	/* The call preserves %rdx.  */
--	callq	__lll_unlock_wake
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorq	%r10, %r10
--	mov	dep_mutex(%rdi), %R8_LP
--	leaq	cond_futex(%rdi), %rdi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -547,15 +479,11 @@ __condvar_cleanup1:
- 	.uleb128 .LcleanupSTART-.LSTARTCODE
- 	.uleb128 .LcleanupEND-.LcleanupSTART
- 	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
--	.uleb128 .LcleanupSTART2-.LSTARTCODE
--	.uleb128 .LcleanupEND2-.LcleanupSTART2
--	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
-+	.uleb128  0
- 	.uleb128 .LcallUR-.LSTARTCODE
- 	.uleb128 .LENDCODE-.LcallUR
- 	.uleb128 0
--	.uleb128 0
-+	.uleb128  0
- .Lcstend:
- 
diff --git a/testing/glibc/glibc-2.15-revert-netlink-cache.patch b/testing/glibc/glibc-2.15-revert-netlink-cache.patch
deleted file mode 100644
index 87d04c794..000000000
--- a/testing/glibc/glibc-2.15-revert-netlink-cache.patch
+++ /dev/null
@@ -1,680 +0,0 @@
-diff --git a/include/ifaddrs.h b/include/ifaddrs.h
-index e1c6cac..50e4c48 100644
---- a/include/ifaddrs.h
-+++ b/include/ifaddrs.h
-@@ -21,13 +21,8 @@ struct in6addrinfo
- extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 			struct in6addrinfo **in6ai, size_t *in6ailen)
-   attribute_hidden;
--extern void __free_in6ai (struct in6addrinfo *in6ai) attribute_hidden;
- extern void __check_native (uint32_t a1_index, int *a1_native,
- 			    uint32_t a2_index, int *a2_native)
-   attribute_hidden;
- 
--#ifdef IS_IN_nscd
--extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
--#endif
--
- #endif	/* ifaddrs.h */
-diff --git a/inet/check_pf.c b/inet/check_pf.c
-index 0fa34cc..b015432 100644
---- a/inet/check_pf.c
-+++ b/inet/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Generic version.
--   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -54,19 +54,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   (void) freeifaddrs (ifa);
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *in6ai)
--{
--  /* Nothing to do.  */
--}
--
--
--#ifdef IS_IN_nscd
--uint32_t
--__bump_nl_timestamp (void)
--{
--  return 0;
--}
--#endif
-diff --git a/nscd/connections.c b/nscd/connections.c
-index c741996..2b5c7ef 100644
---- a/nscd/connections.c
-+++ b/nscd/connections.c
-@@ -24,7 +24,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <grp.h>
--#include <ifaddrs.h>
- #include <libintl.h>
- #include <pthread.h>
- #include <pwd.h>
-@@ -33,10 +32,6 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <arpa/inet.h>
--#ifdef HAVE_NETLINK
--# include <linux/netlink.h>
--# include <linux/rtnetlink.h>
--#endif
- #ifdef HAVE_EPOLL
- # include <sys/epoll.h>
- #endif
-@@ -252,11 +247,6 @@ static int sock;
- int inotify_fd = -1;
- #endif
- 
--#ifdef HAVE_NETLINK
--/* Descriptor for netlink status updates.  */
--static int nl_status_fd = -1;
--#endif
--
- #ifndef __ASSUME_SOCK_CLOEXEC
- /* Negative if SOCK_CLOEXEC is not supported, positive if it is, zero
-    before be know the result.  */
-@@ -913,65 +903,6 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
-       exit (1);
-     }
- 
--#ifdef HAVE_NETLINK
--  if (dbs[hstdb].enabled)
--    {
--      /* Try to open netlink socket to monitor network setting changes.  */
--      nl_status_fd = socket (AF_NETLINK,
--			     SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK,
--			     NETLINK_ROUTE);
--      if (nl_status_fd != -1)
--	{
--	  struct sockaddr_nl snl;
--	  memset (&snl, '\0', sizeof (snl));
--	  snl.nl_family = AF_NETLINK;
--	  /* XXX Is this the best set to use?  */
--	  snl.nl_groups = (RTMGRP_IPV4_IFADDR | RTMGRP_TC | RTMGRP_IPV4_MROUTE
--			   | RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_RULE
--			   | RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_MROUTE
--			   | RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFINFO
--			   | RTMGRP_IPV6_PREFIX);
--
--	  if (bind (nl_status_fd, (struct sockaddr *) &snl, sizeof (snl)) != 0)
--	    {
--	      close (nl_status_fd);
--	      nl_status_fd = -1;
--	    }
--	  else
--	    {
--	      /* Start the timestamp process.  */
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--
--# ifndef __ASSUME_SOCK_CLOEXEC
--	      if (have_sock_cloexec < 0)
--		{
--		  /* We don't want to get stuck on accept.  */
--		  int fl = fcntl (nl_status_fd, F_GETFL);
--		  if (fl == -1
--		      || fcntl (nl_status_fd, F_SETFL, fl | O_NONBLOCK) == -1)
--		    {
--		      dbg_log (_("\
--cannot change socket to nonblocking mode: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--
--		  /* The descriptor needs to be closed on exec.  */
--		  if (paranoia
--		      && fcntl (nl_status_fd, F_SETFD, FD_CLOEXEC) == -1)
--		    {
--		      dbg_log (_("cannot set socket to close on exec: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--		}
--# endif
--	    }
--	}
--    }
--#endif
--
-   /* Change to unprivileged uid/gid/groups if specified in config file */
-   if (server_user != NULL)
-     finish_drop_privileges ();
-@@ -1895,18 +1826,6 @@ main_loop_poll (void)
-     }
- #endif
- 
--#ifdef HAVE_NETLINK
--  size_t idx_nl_status_fd = 0;
--  if (nl_status_fd != -1)
--    {
--      idx_nl_status_fd = nused;
--      conns[nused].fd = nl_status_fd;
--      conns[nused].events = POLLRDNORM;
--      ++nused;
--      firstfree = nused;
--    }
--#endif
--
-   while (1)
-     {
-       /* Wait for any event.  We wait at most a couple of seconds so
-@@ -2049,20 +1968,6 @@ disabled inotify after read error %d"),
- 	    }
- #endif
- 
--#ifdef HAVE_NETLINK
--	  if (idx_nl_status_fd != 0 && conns[idx_nl_status_fd].revents != 0)
--	    {
--	      char buf[4096];
--	      /* Read all the data.  We do not interpret it here.  */
--	      while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					       sizeof (buf))) != -1)
--		;
--
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--	    }
--#endif
--
- 	  for (size_t cnt = first; cnt < nused && n > 0; ++cnt)
- 	    if (conns[cnt].revents != 0)
- 	      {
-@@ -2141,17 +2046,6 @@ main_loop_epoll (int efd)
-     }
- # endif
- 
--# ifdef HAVE_NETLINK
--  if (nl_status_fd != -1)
--    {
--      ev.events = EPOLLRDNORM;
--      ev.data.fd = nl_status_fd;
--      if (epoll_ctl (efd, EPOLL_CTL_ADD, nl_status_fd, &ev) == -1)
--	/* We cannot use epoll.  */
--	return;
--    }
--# endif
--
-   while (1)
-     {
-       struct epoll_event revs[100];
-@@ -2268,18 +2162,6 @@ main_loop_epoll (int efd)
- 		}
- 	  }
- # endif
--# ifdef HAVE_NETLINK
--	else if (revs[cnt].data.fd == nl_status_fd)
--	  {
--	    char buf[4096];
--	    /* Read all the data.  We do not interpret it here.  */
--	    while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					     sizeof (buf))) != -1)
--	      ;
--
--	    __bump_nl_timestamp ();
--	  }
--# endif
- 	else
- 	  {
- 	    /* Remove the descriptor from the epoll descriptor.  */
-@@ -2303,7 +2185,6 @@ main_loop_epoll (int efd)
-       time_t laststart = now - ACCEPT_TIMEOUT;
-       assert (starttime[sock] == 0);
-       assert (inotify_fd == -1 || starttime[inotify_fd] == 0);
--      assert (nl_status_fd == -1 || starttime[nl_status_fd] == 0);
-       for (int cnt = highest; cnt > STDERR_FILENO; --cnt)
- 	if (starttime[cnt] != 0 && starttime[cnt] < laststart)
- 	  {
-diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
-index b5cd2d2..caad26a 100644
---- a/nscd/nscd-client.h
-+++ b/nscd/nscd-client.h
-@@ -260,17 +260,12 @@ struct hashentry
- 
- 
- /* Current persistent database version.  */
--#define DB_VERSION	2
-+#define DB_VERSION	1
- 
- /* Maximum time allowed between updates of the timestamp.  */
- #define MAPPING_TIMEOUT (5 * 60)
- 
- 
--/* Used indices for the EXTRA_DATA element of 'database_pers_head'.
--   Each database has its own indices.  */
--#define NSCD_HST_IDX_CONF_TIMESTAMP	0
--
--
- /* Header of persistent database file.  */
- struct database_pers_head
- {
-@@ -279,8 +274,6 @@ struct database_pers_head
-   volatile int32_t gc_cycle;
-   volatile int32_t nscd_certainly_running;
-   volatile nscd_time_t timestamp;
--  /* Room for extensions.  */
--  volatile uint32_t extra_data[4];
- 
-   nscd_ssize_t module;
-   nscd_ssize_t data_size;
-@@ -329,12 +322,6 @@ extern int __nscd_open_socket (const char *key, size_t keylen,
- 			       request_type type, void *response,
- 			       size_t responselen) attribute_hidden;
- 
--/* Try to get a file descriptor for the shared meory segment
--   containing the database.  */
--extern struct mapped_database *__nscd_get_mapping (request_type type,
--						   const char *key,
--						   struct mapped_database **mappedp) attribute_hidden;
--
- /* Get reference of mapping.  */
- extern struct mapped_database *__nscd_get_map_ref (request_type type,
- 						   const char *name,
-@@ -384,7 +371,4 @@ extern ssize_t writeall (int fd, const void *buf, size_t len)
- extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len)
-   attribute_hidden;
- 
--/* Get netlink timestamp counter from mapped area or zero.  */
--extern uint32_t __nscd_get_nl_timestamp (void);
--
- #endif /* nscd.h */
-diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
-index 6ee142d..70631fa 100644
---- a/nscd/nscd_gethst_r.c
-+++ b/nscd/nscd_gethst_r.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009, 2011
-+/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-@@ -98,27 +98,6 @@ libc_freeres_fn (hst_map_free)
- }
- 
- 
--uint32_t
--__nscd_get_nl_timestamp (void)
--{
--  if (__nss_not_use_nscd_hosts != 0)
--    return 0;
--
--  struct mapped_database *map = __hst_map_handle.mapped;
--
--  if (map == NULL
--      || (map != NO_MAPPING
--	  && map->head->nscd_certainly_running == 0
--	  && map->head->timestamp + MAPPING_TIMEOUT < time (NULL)))
--    map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped);
--
--  if (map == NO_MAPPING)
--    return 0;
--
--  return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP];
--}
--
--
- int __nss_have_localdomain attribute_hidden;
- 
- static int
-diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
-index 365b599..fe63f9a 100644
---- a/nscd/nscd_helper.c
-+++ b/nscd/nscd_helper.c
-@@ -277,9 +277,9 @@ __nscd_unmap (struct mapped_database *mapped)
- 
- /* Try to get a file descriptor for the shared meory segment
-    containing the database.  */
--struct mapped_database *
--__nscd_get_mapping (request_type type, const char *key,
--		    struct mapped_database **mappedp)
-+static struct mapped_database *
-+get_mapping (request_type type, const char *key,
-+	     struct mapped_database **mappedp)
- {
-   struct mapped_database *result = NO_MAPPING;
- #ifdef SCM_RIGHTS
-@@ -449,8 +449,8 @@ __nscd_get_map_ref (request_type type, const char *name,
- 	  || (cur->head->nscd_certainly_running == 0
- 	      && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))
- 	  || cur->head->data_size > cur->datasize)
--	cur = __nscd_get_mapping (type, name,
--				  (struct mapped_database **) &mapptr->mapped);
-+	cur = get_mapping (type, name,
-+			   (struct mapped_database **) &mapptr->mapped);
- 
-       if (__builtin_expect (cur != NO_MAPPING, 1))
- 	{
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index 1a023f9..4979805 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2386,7 +2386,7 @@ getaddrinfo (const char *name, const char *service,
- 	       || (hints->ai_family == PF_INET6 && ! seen_ipv6))
- 	{
- 	  /* We cannot possibly return a valid answer.  */
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 	  return EAI_NONAME;
- 	}
-     }
-@@ -2400,7 +2400,7 @@ getaddrinfo (const char *name, const char *service,
- 	{
- 	  if (hints->ai_flags & AI_NUMERICSERV)
- 	    {
--	      __free_in6ai (in6ai);
-+	      free (in6ai);
- 	      return EAI_NONAME;
- 	    }
- 
-@@ -2422,7 +2422,7 @@ getaddrinfo (const char *name, const char *service,
-       if (last_i != 0)
- 	{
- 	  freeaddrinfo (p);
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 
- 	  return -(last_i & GAIH_EAI);
- 	}
-@@ -2434,7 +2434,7 @@ getaddrinfo (const char *name, const char *service,
-     }
-   else
-     {
--      __free_in6ai (in6ai);
-+      free (in6ai);
-       return EAI_FAMILY;
-     }
- 
-@@ -2622,7 +2622,7 @@ getaddrinfo (const char *name, const char *service,
-       p->ai_canonname = canonname;
-     }
- 
--  __free_in6ai (in6ai);
-+  free (in6ai);
- 
-   if (p)
-     {
-diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
-index e684b16..c907af4 100644
---- a/sysdeps/unix/sysv/linux/Makefile
-+++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -173,6 +173,6 @@ CFLAGS-mq_receive.c += -fexceptions
- endif
- 
- ifeq ($(subdir),nscd)
--sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY -DHAVE_NETLINK
-+sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY
- CFLAGS-gai.c += -DNEED_NETLINK
- endif
-diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
-index 0738a70..d5ad7ea 100644
---- a/sysdeps/unix/sysv/linux/check_pf.c
-+++ b/sysdeps/unix/sysv/linux/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Linux version.
--   Copyright (C) 2003, 2006-2008, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -33,9 +33,6 @@
- 
- #include <not-cancel.h>
- #include <kernel-features.h>
--#include <bits/libc-lock.h>
--#include <atomic.h>
--#include <nscd/nscd-client.h>
- 
- 
- #ifndef IFA_F_HOMEADDRESS
-@@ -46,42 +43,9 @@
- #endif
- 
- 
--struct cached_data
--{
--  uint32_t timestamp;
--  uint32_t usecnt;
--  bool seen_ipv4;
--  bool seen_ipv6;
--  size_t in6ailen;
--  struct in6addrinfo in6ai[0];
--};
--
--static struct cached_data noai6ai_cached =
--  {
--    .usecnt = 1,	/* Make sure we never try to delete this entry.  */
--    .in6ailen = 0
--  };
--
--static struct cached_data *cache;
--__libc_lock_define_initialized (static, lock);
--
--
--#ifdef IS_IN_nscd
--static uint32_t nl_timestamp;
--
--uint32_t
--__bump_nl_timestamp (void)
--{
--  if (atomic_increment_val (&nl_timestamp) == 0)
--    atomic_increment (&nl_timestamp);
--
--  return nl_timestamp;
--}
--#endif
--
--
--static struct cached_data *
--make_request (int fd, pid_t pid)
-+static int
-+make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
-+	      struct in6addrinfo **in6ai, size_t *in6ailen)
- {
-   struct req
-   {
-@@ -135,6 +99,9 @@ make_request (int fd, pid_t pid)
- 				    sizeof (nladdr))) < 0)
-     goto out_fail;
- 
-+  *seen_ipv4 = false;
-+  *seen_ipv6 = false;
-+
-   bool done = false;
-   struct in6ailist
-   {
-@@ -142,8 +109,6 @@ make_request (int fd, pid_t pid)
-     struct in6ailist *next;
-   } *in6ailist = NULL;
-   size_t in6ailistlen = 0;
--  bool seen_ipv4 = false;
--  bool seen_ipv6 = false;
- 
-   do
-     {
-@@ -207,12 +172,12 @@ make_request (int fd, pid_t pid)
- 		    {
- 		      if (*(const in_addr_t *) address
- 			  != htonl (INADDR_LOOPBACK))
--			seen_ipv4 = true;
-+			*seen_ipv4 = true;
- 		    }
- 		  else
- 		    {
- 		      if (!IN6_IS_ADDR_LOOPBACK (address))
--			seen_ipv6 = true;
-+			*seen_ipv6 = true;
- 		    }
- 		}
- 
-@@ -246,47 +211,30 @@ make_request (int fd, pid_t pid)
-     }
-   while (! done);
- 
--  struct cached_data *result;
--  if (seen_ipv6 && in6ailist != NULL)
-+  if (*seen_ipv6 && in6ailist != NULL)
-     {
--      result = malloc (sizeof (*result)
--		       + in6ailistlen * sizeof (struct in6addrinfo));
--      if (result == NULL)
-+      *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
-+      if (*in6ai == NULL)
- 	goto out_fail;
- 
--#ifdef IS_IN_nscd
--      result->timestamp = nl_timestamp;
--#else
--      result->timestamp = __nscd_get_nl_timestamp ();
--#endif
--      result->usecnt = 2;
--      result->seen_ipv4 = seen_ipv4;
--      result->seen_ipv6 = true;
--      result->in6ailen = in6ailistlen;
-+      *in6ailen = in6ailistlen;
- 
-       do
- 	{
--	  result->in6ai[--in6ailistlen] = in6ailist->info;
-+	  (*in6ai)[--in6ailistlen] = in6ailist->info;
- 	  in6ailist = in6ailist->next;
- 	}
-       while (in6ailist != NULL);
-     }
--  else
--    {
--      atomic_add (&noai6ai_cached.usecnt, 2);
--      noai6ai_cached.seen_ipv4 = seen_ipv4;
--      noai6ai_cached.seen_ipv6 = seen_ipv6;
--      result = &noai6ai_cached;
--    }
- 
-   if (use_malloc)
-     free (buf);
--  return result;
-+  return 0;
- 
- out_fail:
-   if (use_malloc)
-     free (buf);
--  return NULL;
-+  return -1;
- }
- 
- 
-@@ -310,65 +258,28 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   if (! __no_netlink_support)
-     {
--      struct cached_data *olddata = NULL;
--      struct cached_data *data = NULL;
-+      int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- 
--      __libc_lock_lock (lock);
--
--#ifdef IS_IN_nscd
--# define cache_valid() nl_timestamp != 0 && cache->timestamp == nl_timestamp
--#else
--# define cache_valid() \
--      ({ uint32_t val = __nscd_get_nl_timestamp ();			      \
--	 val != 0 && cache->timestamp == val; })
--#endif
--      if (cache != NULL && cache_valid ())
--	{
--	  data = cache;
--	  atomic_increment (&cache->usecnt);
--	}
--      else
-+      if (__builtin_expect (fd >= 0, 1))
- 	{
--	  int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-+	  struct sockaddr_nl nladdr;
-+	  memset (&nladdr, '\0', sizeof (nladdr));
-+	  nladdr.nl_family = AF_NETLINK;
- 
--	  if (__builtin_expect (fd >= 0, 1))
--	    {
--	      struct sockaddr_nl nladdr;
--	      memset (&nladdr, '\0', sizeof (nladdr));
--	      nladdr.nl_family = AF_NETLINK;
--
--	      socklen_t addr_len = sizeof (nladdr);
--
--	      if(__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
--		 && __getsockname (fd, (struct sockaddr *) &nladdr,
--				   &addr_len) == 0)
--		data = make_request (fd, nladdr.nl_pid);
--
--	      close_not_cancel_no_status (fd);
--	    }
--
--	  if (data != NULL)
--	    {
--	      olddata = cache;
--	      cache = data;
--	    }
--	}
-+	  socklen_t addr_len = sizeof (nladdr);
- 
--      __libc_lock_unlock (lock);
-+	  bool success
-+	    = (__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
-+	       && __getsockname (fd, (struct sockaddr *) &nladdr,
-+				 &addr_len) == 0
-+	       && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
-+				in6ai, in6ailen) == 0);
- 
--      if (data != NULL)
--	{
--	  /* It worked.  */
--	  *seen_ipv4 = data->seen_ipv4;
--	  *seen_ipv6 = data->seen_ipv6;
--	  *in6ailen = data->in6ailen;
--	  *in6ai = data->in6ai;
--
--	  if (olddata != NULL && olddata->usecnt > 0
--	      && atomic_add_zero (&olddata->usecnt, -1))
--	    free (olddata);
-+	  close_not_cancel_no_status (fd);
- 
--	  return;
-+	  if (success)
-+	    /* It worked.  */
-+	    return;
- 	}
- 
- #if __ASSUME_NETLINK_SUPPORT == 0
-@@ -407,26 +318,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
-   (void) freeifaddrs (ifa);
- #endif
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *ai)
--{
--  if (ai != NULL)
--    {
--      struct cached_data *data =
--	(struct cached_data *) ((char *) ai
--				- offsetof (struct cached_data, in6ai));
--
--      if (atomic_add_zero (&data->usecnt, -1))
--	{
--	  __libc_lock_lock (lock);
--
--	  if (data->usecnt == 0)
--	    /* Still unused.  */
--	    free (data);
--
--	  __libc_lock_unlock (lock);
--	}
--    }
--}
diff --git a/testing/glibc/glibc-2.15-rintf-rounding.patch b/testing/glibc/glibc-2.15-rintf-rounding.patch
deleted file mode 100644
index e0240ac6c..000000000
--- a/testing/glibc/glibc-2.15-rintf-rounding.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index 6243e1e..c8186c8 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -5037,6 +5037,22 @@ rint_test (void)
-   TEST_f_f (rint, 262142.75, 262143.0);
-   TEST_f_f (rint, 524286.75, 524287.0);
-   TEST_f_f (rint, 524288.75, 524289.0);
-+  TEST_f_f (rint, 1048576.75, 1048577.0);
-+  TEST_f_f (rint, 2097152.75, 2097153.0);
-+  TEST_f_f (rint, -1048576.75, -1048577.0);
-+  TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-   /* The result can only be represented in long double.  */
-   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5277,6 +5325,22 @@ rint_test_downward (void)
-       TEST_f_f (rint, -0.1, -1.0);
-       TEST_f_f (rint, -0.25, -1.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5347,6 +5411,22 @@ rint_test_upward (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
-index 9ea9b6f..9ba6b57 100644
---- a/sysdeps/ieee754/flt-32/s_rintf.c
-+++ b/sysdeps/ieee754/flt-32/s_rintf.c
-@@ -26,34 +26,22 @@ float
- __rintf(float x)
- {
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(j0==0x80) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	w = TWO23[sx]+x;
- 	return w-TWO23[sx];
- }
diff --git a/testing/glibc/glibc-2.15-scanf.patch b/testing/glibc/glibc-2.15-scanf.patch
deleted file mode 100644
index a2561b232..000000000
--- a/testing/glibc/glibc-2.15-scanf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
-index 0e71deb..e18a6c3 100644
---- a/stdio-common/vfscanf.c
-+++ b/stdio-common/vfscanf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 1991-2007, 2010, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -274,7 +274,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
- 	  CHAR_T *old = wp;						    \
- 	  size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax			    \
- 			    ? UCHAR_MAX + 1 : 2 * wpmax);		    \
--	  if (use_malloc || __libc_use_alloca (newsize))		    \
-+	  if (use_malloc || !__libc_use_alloca (newsize))		    \
- 	    {								    \
- 	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
- 	      if (wp == NULL)						    \
diff --git a/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch b/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch
deleted file mode 100644
index 4c104fa55..000000000
--- a/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
-	jne	1f
-	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strcasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
-	leaq	__strcasecmp_sse42(%rip), %rax
-	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
-	jnz	2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
-	jne	1f
-	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strncasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
-	leaq	__strncasecmp_sse42(%rip), %rax
-	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
-	jnz	2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
-
-
--# ifdef HAVE_AVX_SUPPORT
--#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--#   define LABEL(l) .L##l##_avx
--#   define GLABEL(l) l##_avx
--#   define USE_AVX 1
--#   undef STRCMP_SSE42
--#   define STRCMP_SSE42 STRCMP_AVX
--#   define SECTION avx
--#   include "strcmp-sse42.S"
--#  endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
-	.type STRCMP_SSE2, @function; \
diff --git a/testing/glibc/glibc-2.15-testsuite.patch b/testing/glibc/glibc-2.15-testsuite.patch
deleted file mode 100644
index 7eaeaed65..000000000
--- a/testing/glibc/glibc-2.15-testsuite.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Mon, 16 Apr 2012 14:06:47 +1000
-Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
----
- ChangeLog       |   24 ++++++++++++++++++++++++
- elf/Makefile    |   21 ++++++++++++++++++++-
- nptl/ChangeLog  |    5 +++++
- nptl/Makefile   |    3 ++-
- stdlib/Makefile |    1 +
- 5 files changed, 52 insertions(+), 2 deletions(-)
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 57dcab0..47729c3 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb
- $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so
- $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so
- 
-+LDFLAGS-nodel2mod3.so = $(no-as-needed)
-+LDFLAGS-reldepmod5.so = $(no-as-needed)
-+LDFLAGS-reldep6mod1.so = $(no-as-needed)
-+LDFLAGS-reldep6mod4.so = $(no-as-needed)
-+LDFLAGS-reldep8mod3.so = $(no-as-needed)
-+LDFLAGS-unload4mod1.so = $(no-as-needed)
-+LDFLAGS-unload4mod2.so = $(no-as-needed)
-+LDFLAGS-tst-initorder = $(no-as-needed)
-+LDFLAGS-tst-initordera2.so = $(no-as-needed)
-+LDFLAGS-tst-initordera3.so = $(no-as-needed)
-+LDFLAGS-tst-initordera4.so = $(no-as-needed)
-+LDFLAGS-tst-initorderb2.so = $(no-as-needed)
- LDFLAGS-tst-tlsmod5.so = -nostdlib
- LDFLAGS-tst-tlsmod6.so = -nostdlib
- 
-@@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so)
- vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so)
- 
- $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so
--LDFLAGS-noload = -rdynamic
-+LDFLAGS-noload = -rdynamic $(no-as-needed)
- $(objpfx)noload.out: $(objpfx)testobj5.so
- 
- $(objpfx)noload-mem: $(objpfx)noload.out
-@@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl)
- $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so
- 
- $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl)
-+LDFLAGS-next = $(no-as-needed)
- 
- $(objpfx)unload2: $(libdl)
- $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so
-@@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so
- $(objpfx)order2mod4.so: $(objpfx)order2mod3.so
- $(objpfx)order2mod2.so: $(objpfx)order2mod3.so
- order2mod2.so-no-z-defs = yes
-+LDFLAGS-order2mod1.so = $(no-as-needed)
-+LDFLAGS-order2mod2.so = $(no-as-needed)
- 
- tst-stackguard1-ARGS = --command "$(built-program-cmd) --child"
- tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
-@@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so
- $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so
- $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so
- $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so
-+LDFLAGS-tst-initorder2 = $(no-as-needed)
-+LDFLAGS-tst-initorder2a.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2b.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2c.so = $(no-as-needed)
- define o-iterator-doit
- $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \
- $$(compile-command.c) -DNAME=\"$o\"
-diff --git a/nptl/Makefile b/nptl/Makefile
-index 09acd8a..07a1022 100644
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library)
- $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so
- 
- $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library)
-+LDFLAGS-tst-tls5 = $(no-as-needed)
- LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so
- 
- ifeq ($(build-shared),yes)
-@@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a
- $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a
- endif
- 
--LDFLAGS-tst-cancel24 = -lstdc++
-+LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++
- 
- extra-B-pthread.so = -B$(common-objpfx)nptl/
- $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index 44eb20d..f7811c5 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
- 	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/
- 
- $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so
-+LDFLAGS-tst-putenv = $(no-as-needed)
- 
- $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os
- 	$(build-module)
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.15-vdso.patch b/testing/glibc/glibc-2.15-vdso.patch
deleted file mode 100644
index 7fd394f90..000000000
--- a/testing/glibc/glibc-2.15-vdso.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/elf/Makefile b/elf/Makefile
-index 8234ba7..25ffc57 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
- $(objpfx)tst-relsort1mod2.so: $(libm)
- $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
- 			   $(objpfx)tst-relsort1mod2.so
-+
-+tests: $(objpfx)tst-unused-dep.out
-+
-+$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
-+	LD_TRACE_LOADED_OBJECTS=1 \
-+	LD_DEBUG=unused \
-+	LD_PRELOAD= \
-+	$(elf-objpfx)${rtld-installed-name} \
-+	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
-+	  $< > $@
-+	cmp $@ /dev/null > /dev/null
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2e4f97f..3e15447 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1,5 +1,5 @@
- /* Run time dynamic linker.
--   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	  _dl_setup_hash (l);
- 	  l->l_relocated = 1;
- 
-+	  /* The vDSO is always used.  */
-+	  l->l_used = 1;
-+
- 	  /* Initialize l_local_scope to contain just this map.  This allows
- 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
- 	     So we create a single entry list pointing to l_real as its only
diff --git a/testing/glibc/glibc-2.15-vfprintf-nargs.patch b/testing/glibc/glibc-2.15-vfprintf-nargs.patch
deleted file mode 100644
index f8dde53f5..000000000
--- a/testing/glibc/glibc-2.15-vfprintf-nargs.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/stdio-common/Makefile b/stdio-common/Makefile
-index a847b28..080badc 100644
---- a/stdio-common/Makefile
-+++ b/stdio-common/Makefile
-@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
- 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
- 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
- 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
--	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
-+	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
-+	 bug-vfprintf-nargs
- 
- test-srcs = tst-unbputc tst-printf
- 
-diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
-new file mode 100644
-index 0000000..13c66c0
---- /dev/null
-+++ b/stdio-common/bug-vfprintf-nargs.c
-@@ -0,0 +1,78 @@
-+/* Test for vfprintf nargs allocation overflow (BZ #13656).
-+   Copyright (C) 2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Kees Cook <keescook@chromium.org>, 2012.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <unistd.h>
-+#include <inttypes.h>
-+#include <string.h>
-+#include <signal.h>
-+
-+static int
-+format_failed (const char *fmt, const char *expected)
-+{
-+  char output[80];
-+
-+  printf ("%s : ", fmt);
-+
-+  memset (output, 0, sizeof output);
-+  /* Having sprintf itself detect a failure is good.  */
-+  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
-+      && strcmp (output, expected) != 0)
-+    {
-+      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
-+      return 1;
-+    }
-+  puts ("ok");
-+  return 0;
-+}
-+
-+static int
-+do_test (void)
-+{
-+  int rc = 0;
-+  char buf[64];
-+
-+  /* Regular positionals work.  */
-+  if (format_failed ("%1$d", "1") != 0)
-+    rc = 1;
-+
-+  /* Regular width positionals work.  */
-+  if (format_failed ("%1$*2$d", " 1") != 0)
-+    rc = 1;
-+
-+  /* Positional arguments are constructed via read_int, so nargs can only
-+     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
-+     allocate a giant amount of memory and possibly crash, which is the
-+     expected situation.  Since the 64-bit behavior is arch-specific, only
-+     test this on 32-bit systems.  */
-+  if (sizeof (long int) == 4)
-+    {
-+      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
-+      if (format_failed (buf, "1 %$d") != 0)
-+        rc = 1;
-+    }
-+
-+  return rc;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
-index 863cd5d..c802e46 100644
---- a/stdio-common/vfprintf.c
-+++ b/stdio-common/vfprintf.c
-@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
-      0 if unknown.  */
-   int readonly_format = 0;
- 
-+  /* For the argument descriptions, which may be allocated on the heap.  */
-+  void *args_malloced = NULL;
-+
-   /* This table maps a character into a number representing a
-      class.  In each step there is a destination label for each
-      class.  */
-@@ -1647,9 +1650,10 @@ do_positional:
-        determine the size of the array needed to store the argument
-        attributes.  */
-     size_t nargs = 0;
--    int *args_type;
--    union printf_arg *args_value = NULL;
-+    size_t bytes_per_arg;
-+    union printf_arg *args_value;
-     int *args_size;
-+    int *args_type;
- 
-     /* Positional parameters refer to arguments directly.  This could
-        also determine the maximum number of arguments.  Track the
-@@ -1698,13 +1702,38 @@ do_positional:
- 
-     /* Determine the number of arguments the format string consumes.  */
-     nargs = MAX (nargs, max_ref_arg);
-+    /* Calculate total size needed to represent a single argument across
-+       all three argument-related arrays.  */
-+    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
-+                    + sizeof (*args_type);
-+
-+    /* Check for potential integer overflow.  */
-+    if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0))
-+      {
-+         __set_errno (ERANGE);
-+         done = -1;
-+         goto all_done;
-+      }
- 
--    /* Allocate memory for the argument descriptions.  */
--    args_type = alloca (nargs * sizeof (int));
-+    /* Allocate memory for all three argument arrays.  */
-+    if (__libc_use_alloca (nargs * bytes_per_arg))
-+        args_value = alloca (nargs * bytes_per_arg);
-+    else
-+      {
-+        args_value = args_malloced = malloc (nargs * bytes_per_arg);
-+        if (args_value == NULL)
-+          {
-+            done = -1;
-+            goto all_done;
-+          }
-+      }
-+
-+    /* Set up the remaining two arrays to each point past the end of the
-+       prior array, since space for all three has been allocated now.  */
-+    args_size = &args_value[nargs].pa_int;
-+    args_type = &args_size[nargs];
-     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
--	    nargs * sizeof (int));
--    args_value = alloca (nargs * sizeof (union printf_arg));
--    args_size = alloca (nargs * sizeof (int));
-+	    nargs * sizeof (*args_type));
- 
-     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
-        still zero after this loop, format is invalid.  For now we
-@@ -1973,8 +2002,8 @@ do_positional:
-   }
- 
- all_done:
--  if (__builtin_expect (workstart != NULL, 0))
--    free (workstart);
-+  free (args_malloced);
-+  free (workstart);
-   /* Unlock the stream.  */
-   _IO_funlockfile (s);
-   _IO_cleanup_region_end (0);
diff --git a/testing/glibc/glibc-2.16-detect-fma.patch b/testing/glibc/glibc-2.16-detect-fma.patch
deleted file mode 100644
index daffb9768..000000000
--- a/testing/glibc/glibc-2.16-detect-fma.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
-index fb44dcf..fed5ab8 100644
---- a/sysdeps/x86_64/multiarch/init-arch.c
-+++ b/sysdeps/x86_64/multiarch/init-arch.c
-@@ -156,6 +156,9 @@ __init_cpu_features (void)
- 	  /* Determine if AVX is usable.  */
- 	  if (CPUID_AVX)
- 	    __cpu_features.feature[index_AVX_Usable] |= bit_AVX_Usable;
-+	  /* Determine if FMA is usable.  */
-+	  if (CPUID_FMA)
-+	    __cpu_features.feature[index_FMA_Usable] |= bit_FMA_Usable;
- 	  /* Determine if FMA4 is usable.  */
- 	  if (CPUID_FMA4)
- 	    __cpu_features.feature[index_FMA4_Usable] |= bit_FMA4_Usable;
-diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
-index 45e2651..f33f1c8 100644
---- a/sysdeps/x86_64/multiarch/init-arch.h
-+++ b/sysdeps/x86_64/multiarch/init-arch.h
-@@ -22,7 +22,8 @@
- #define bit_Fast_Unaligned_Load		(1 << 4)
- #define bit_Prefer_PMINUB_for_stringop	(1 << 5)
- #define bit_AVX_Usable			(1 << 6)
--#define bit_FMA4_Usable			(1 << 7)
-+#define bit_FMA_Usable			(1 << 7)
-+#define bit_FMA4_Usable			(1 << 8)
- 
- /* CPUID Feature flags.  */
- #define bit_SSE2	(1 << 26)
-@@ -56,6 +57,7 @@
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
- # define index_AVX_Usable		FEATURE_INDEX_1*FEATURE_SIZE
-+# define index_FMA_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- # define index_FMA4_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- 
- #else	/* __ASSEMBLER__ */
-@@ -131,6 +133,8 @@ extern const struct cpu_features *__get_cpu_features (void)
-   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_OSXSAVE)
- # define CPUID_AVX \
-   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_AVX)
-+# define CPUID_FMA \
-+  HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_FMA)
- # define CPUID_FMA4 \
-   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_80000001, ecx, bit_FMA4)
- 
-@@ -140,7 +144,6 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define HAS_SSSE3	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSSE3)
- # define HAS_SSE4_1	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_1)
- # define HAS_SSE4_2	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_2)
--# define HAS_FMA	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_FMA)
- 
- # define index_Fast_Rep_String		FEATURE_INDEX_1
- # define index_Fast_Copy_Backward	FEATURE_INDEX_1
-@@ -148,6 +151,7 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1
- # define index_AVX_Usable		FEATURE_INDEX_1
-+# define index_FMA_Usable		FEATURE_INDEX_1
- # define index_FMA4_Usable		FEATURE_INDEX_1
- 
- # define HAS_ARCH_FEATURE(name) \
-@@ -159,6 +163,7 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define HAS_PREFER_SSE_FOR_MEMOP	HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
- # define HAS_FAST_UNALIGNED_LOAD	HAS_ARCH_FEATURE (Fast_Unaligned_Load)
- # define HAS_AVX			HAS_ARCH_FEATURE (AVX_Usable)
-+# define HAS_FMA			HAS_ARCH_FEATURE (FMA_Usable)
- # define HAS_FMA4			HAS_ARCH_FEATURE (FMA4_Usable)
- 
- #endif	/* __ASSEMBLER__ */
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.16-glob-use-size_t.patch b/testing/glibc/glibc-2.16-glob-use-size_t.patch
deleted file mode 100644
index 8c5df45be..000000000
--- a/testing/glibc/glibc-2.16-glob-use-size_t.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/posix/glob.c b/posix/glob.c
-index 68ea205..87d4f1b 100644
---- a/posix/glob.c
-+++ b/posix/glob.c
-@@ -217,7 +217,7 @@ static int collated_compare (const void *, const void *) __THROW;
- static const char *
- next_brace_sub (const char *cp, int flags)
- {
--  unsigned int depth = 0;
-+  size_t depth = 0;
-   while (*cp != '\0')
-     if ((flags & GLOB_NOESCAPE) == 0 && *cp == '\\')
-       {
-@@ -960,7 +960,7 @@ glob (pattern, flags, errfunc, pglob)
- 		  && S_ISDIR (st.st_mode))
- 	       : (__stat64 (dirname, &st64) == 0 && S_ISDIR (st64.st_mode)))))
- 	{
--	  int newcount = pglob->gl_pathc + pglob->gl_offs;
-+	  size_t newcount = pglob->gl_pathc + pglob->gl_offs;
- 	  char **new_gl_pathv;
- 
- 	  if (newcount > UINTPTR_MAX - (1 + 1)
-@@ -1059,7 +1059,7 @@ glob (pattern, flags, errfunc, pglob)
- 	 appending the results to PGLOB.  */
-       for (i = 0; i < dirs.gl_pathc; ++i)
- 	{
--	  int old_pathc;
-+	  size_t old_pathc;
- 
- #ifdef	SHELL
- 	  {
-@@ -1114,7 +1114,7 @@ glob (pattern, flags, errfunc, pglob)
- 	  /* No matches.  */
- 	  if (flags & GLOB_NOCHECK)
- 	    {
--	      int newcount = pglob->gl_pathc + pglob->gl_offs;
-+	      size_t newcount = pglob->gl_pathc + pglob->gl_offs;
- 	      char **new_gl_pathv;
- 
- 	      if (newcount > UINTPTR_MAX - 2
-@@ -1158,7 +1158,7 @@ glob (pattern, flags, errfunc, pglob)
-     }
-   else
-     {
--      int old_pathc = pglob->gl_pathc;
-+      size_t old_pathc = pglob->gl_pathc;
-       int orig_flags = flags;
- 
-       if (meta & 2)
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch b/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch
deleted file mode 100644
index 822b57294..000000000
--- a/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
-index 06d951a..2103b10 100644
---- a/sunrpc/rpc_main.c
-+++ b/sunrpc/rpc_main.c
-@@ -75,12 +75,9 @@ struct commandline
- 
- static const char *cmdname;
- 
--#define SVR4_CPP "/usr/ccs/lib/cpp"
--#define SUNOS_CPP "/lib/cpp"
--
- static const char *svcclosetime = "120";
- static int cppDefined;	/* explicit path for C preprocessor */
--static const char *CPP = SUNOS_CPP;
-+static const char *CPP = "/lib/cpp";
- static const char CPPFLAGS[] = "-C";
- static char *pathbuf;
- static int cpp_pid;
-@@ -327,23 +324,17 @@ find_cpp (void)
- {
-   struct stat buf;
- 
--  if (stat (CPP, &buf) < 0)
--    {				/* /lib/cpp or explicit cpp does not exist */
--      if (cppDefined)
--	{
--	  fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
--	  crash ();
--	}
--      else
--	{			/* try the other one */
--	  CPP = SVR4_CPP;
--	  if (stat (CPP, &buf) < 0)
--	    {			/* can't find any cpp */
--	      fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
--	      crash ();
--	    }
--	}
-+  if (stat (CPP, &buf) == 0)
-+    return;
-+
-+  if (cppDefined) /* user specified cpp but it does not exist */
-+    {
-+      fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+      crash ();
-     }
-+
-+  /* fall back to system CPP */
-+  CPP = "cpp";
- }
- 
- /*
-@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define)
-       close (1);
-       dup2 (pd[1], 1);
-       close (pd[0]);
--      execv (arglist[0], (char **) arglist);
--      perror ("execv");
-+      execvp (arglist[0], (char **) arglist);
-+      if (errno == ENOENT)
-+        {
-+          fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+          exit (1);
-+        }
-+      perror ("execvp");
-       exit (1);
-     case -1:
-       perror ("fork");
diff --git a/testing/glibc/glibc-2.16-strncasecmp-segfault.patch b/testing/glibc/glibc-2.16-strncasecmp-segfault.patch
deleted file mode 100644
index ce91bbe82..000000000
--- a/testing/glibc/glibc-2.16-strncasecmp-segfault.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c
-index 6c17530..acfe668 100644
---- a/string/test-strncasecmp.c
-+++ b/string/test-strncasecmp.c
-@@ -1,5 +1,5 @@
- /* Test and measure strncasecmp functions.
--   Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc.
-+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
- 
-@@ -251,9 +251,9 @@ do_random_tests (void)
-     }
- }
- 
--
-+/* Regression test for BZ #12205 */
- static void
--check1 (void)
-+bz12205 (void)
- {
-   static char cp [4096+16] __attribute__ ((aligned(4096)));
-   static char gotrel[4096] __attribute__ ((aligned(4096)));
-@@ -270,6 +270,15 @@ check1 (void)
-     check_result (impl, s1, s2, n, exp_result);
- }
- 
-+/* Regression test for BZ #14195 */
-+static void
-+bz14195 (void)
-+{
-+  const char *empty_string  = "";
-+  FOR_EACH_IMPL (impl, 0)
-+    check_result (impl, empty_string, "", 5, 0);
-+}
-+
- int
- test_main (void)
- {
-@@ -277,7 +286,8 @@ test_main (void)
- 
-   test_init ();
- 
--  check1 ();
-+  bz12205 ();
-+  bz14195 ();
- 
-   printf ("%23s", "");
-   FOR_EACH_IMPL (impl, 0)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-index 5e6321e..9735ad0 100644
---- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-@@ -2445,7 +2445,7 @@ L(less16bytes_sncmp):
- # endif
- 	jne	L(neq_sncmp)
- 	test	%cl, %cl
--	je	L(eq)
-+	je	L(eq_sncmp)
- 
- 	cmp	$1, REM
- 	je	L(eq_sncmp)
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.16-strtod-overflow.patch b/testing/glibc/glibc-2.16-strtod-overflow.patch
deleted file mode 100644
index 526296325..000000000
--- a/testing/glibc/glibc-2.16-strtod-overflow.patch
+++ /dev/null
@@ -1,389 +0,0 @@
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index f7811c5..79c9acb 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -68,7 +68,8 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
- 		   tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
- 		   tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2	    \
- 		   tst-makecontext2 tst-strtod6 tst-unsetenv1		    \
--		   tst-makecontext3 bug-getcontext bug-fmtmsg1
-+		   tst-makecontext3 bug-getcontext bug-fmtmsg1		    \
-+		   tst-strtod-overflow
- 
- include ../Makeconfig
- 
-diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
-index 2166a08..a8a7ea8 100644
---- a/stdlib/strtod_l.c
-+++ b/stdlib/strtod_l.c
-@@ -60,6 +60,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
- #include <math.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /* The gmp headers need some configuration frobs.  */
- #define HAVE_ALLOCA 1
-@@ -72,7 +73,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
- #include "longlong.h"
- #include "fpioconst.h"
- 
--#define NDEBUG 1
- #include <assert.h>
- 
- 
-@@ -174,19 +174,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1];
- /* Return a floating point number of the needed type according to the given
-    multi-precision number after possible rounding.  */
- static FLOAT
--round_and_return (mp_limb_t *retval, int exponent, int negative,
-+round_and_return (mp_limb_t *retval, intmax_t exponent, int negative,
- 		  mp_limb_t round_limb, mp_size_t round_bit, int more_bits)
- {
-   if (exponent < MIN_EXP - 1)
-     {
--      mp_size_t shift = MIN_EXP - 1 - exponent;
--
--      if (shift > MANT_DIG)
-+      if (exponent < MIN_EXP - 1 - MANT_DIG)
- 	{
- 	  __set_errno (ERANGE);
- 	  return 0.0;
- 	}
- 
-+      mp_size_t shift = MIN_EXP - 1 - exponent;
-+
-       more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0;
-       if (shift == MANT_DIG)
- 	/* This is a special case to handle the very seldom case where
-@@ -233,6 +233,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-       __set_errno (ERANGE);
-     }
- 
-+  if (exponent > MAX_EXP)
-+    goto overflow;
-+
-   if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0
-       && (more_bits || (retval[0] & 1) != 0
- 	  || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0))
-@@ -258,6 +261,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-     }
- 
-   if (exponent > MAX_EXP)
-+  overflow:
-     return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
- 
-   return MPN2FLOAT (retval, exponent, negative);
-@@ -271,7 +275,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-    factor for the resulting number (see code) multiply by it.  */
- static const STRING_TYPE *
- str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
--	    int *exponent
-+	    intmax_t *exponent
- #ifndef USE_WIDE_CHAR
- 	    , const char *decimal, size_t decimal_len, const char *thousands
- #endif
-@@ -301,6 +305,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
- 	      cy += __mpn_add_1 (n, n, *nsize, low);
- 	      if (cy != 0)
- 		{
-+		  assert (*nsize < MPNSIZE);
- 		  n[*nsize] = cy;
- 		  ++(*nsize);
- 		}
-@@ -335,7 +340,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
-     }
-   while (--digcnt > 0);
- 
--  if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB)
-+  if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt)
-     {
-       low *= _tens_in_limb[*exponent];
-       start = _tens_in_limb[cnt + *exponent];
-@@ -355,7 +360,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
-       cy = __mpn_mul_1 (n, n, *nsize, start);
-       cy += __mpn_add_1 (n, n, *nsize, low);
-       if (cy != 0)
--	n[(*nsize)++] = cy;
-+	{
-+	  assert (*nsize < MPNSIZE);
-+	  n[(*nsize)++] = cy;
-+	}
-     }
- 
-   return str;
-@@ -413,7 +421,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- {
-   int negative;			/* The sign of the number.  */
-   MPN_VAR (num);		/* MP representation of the number.  */
--  int exponent;			/* Exponent of the number.  */
-+  intmax_t exponent;		/* Exponent of the number.  */
- 
-   /* Numbers starting `0X' or `0x' have to be processed with base 16.  */
-   int base = 10;
-@@ -435,7 +443,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-   /* Points at the character following the integer and fractional digits.  */
-   const STRING_TYPE *expp;
-   /* Total number of digit and number of digits in integer part.  */
--  int dig_no, int_no, lead_zero;
-+  size_t dig_no, int_no, lead_zero;
-   /* Contains the last character read.  */
-   CHAR_TYPE c;
- 
-@@ -767,7 +775,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-      are all or any is really a fractional digit will be decided
-      later.  */
-   int_no = dig_no;
--  lead_zero = int_no == 0 ? -1 : 0;
-+  lead_zero = int_no == 0 ? (size_t) -1 : 0;
- 
-   /* Read the fractional digits.  A special case are the 'american
-      style' numbers like `16.' i.e. with decimal point but without
-@@ -789,12 +797,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	     (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c);
- 			       lo >= L_('a') && lo <= L_('f'); })))
- 	{
--	  if (c != L_('0') && lead_zero == -1)
-+	  if (c != L_('0') && lead_zero == (size_t) -1)
- 	    lead_zero = dig_no - int_no;
- 	  ++dig_no;
- 	  c = *++cp;
- 	}
-     }
-+  assert (dig_no <= (uintmax_t) INTMAX_MAX);
- 
-   /* Remember start of exponent (if any).  */
-   expp = cp;
-@@ -817,24 +826,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 
-       if (c >= L_('0') && c <= L_('9'))
- 	{
--	  int exp_limit;
-+	  intmax_t exp_limit;
- 
- 	  /* Get the exponent limit. */
- 	  if (base == 16)
--	    exp_limit = (exp_negative ?
--			 -MIN_EXP + MANT_DIG + 4 * int_no :
--			 MAX_EXP - 4 * int_no + 4 * lead_zero + 3);
-+	    {
-+	      if (exp_negative)
-+		{
-+		  assert (int_no <= (uintmax_t) (INTMAX_MAX
-+						 + MIN_EXP - MANT_DIG) / 4);
-+		  exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no;
-+		}
-+	      else
-+		{
-+		  if (int_no)
-+		    {
-+		      assert (lead_zero == 0
-+			      && int_no <= (uintmax_t) INTMAX_MAX / 4);
-+		      exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3;
-+		    }
-+		  else if (lead_zero == (size_t) -1)
-+		    {
-+		      /* The number is zero and this limit is
-+			 arbitrary.  */
-+		      exp_limit = MAX_EXP + 3;
-+		    }
-+		  else
-+		    {
-+		      assert (lead_zero
-+			      <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4);
-+		      exp_limit = (MAX_EXP
-+				   + 4 * (intmax_t) lead_zero
-+				   + 3);
-+		    }
-+		}
-+	    }
- 	  else
--	    exp_limit = (exp_negative ?
--			 -MIN_10_EXP + MANT_DIG + int_no :
--			 MAX_10_EXP - int_no + lead_zero + 1);
-+	    {
-+	      if (exp_negative)
-+		{
-+		  assert (int_no
-+			  <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG));
-+		  exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no;
-+		}
-+	      else
-+		{
-+		  if (int_no)
-+		    {
-+		      assert (lead_zero == 0
-+			      && int_no <= (uintmax_t) INTMAX_MAX);
-+		      exp_limit = MAX_10_EXP - (intmax_t) int_no + 1;
-+		    }
-+		  else if (lead_zero == (size_t) -1)
-+		    {
-+		      /* The number is zero and this limit is
-+			 arbitrary.  */
-+		      exp_limit = MAX_10_EXP + 1;
-+		    }
-+		  else
-+		    {
-+		      assert (lead_zero
-+			      <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1));
-+		      exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1;
-+		    }
-+		}
-+	    }
-+
-+	  if (exp_limit < 0)
-+	    exp_limit = 0;
- 
- 	  do
- 	    {
--	      exponent *= 10;
--	      exponent += c - L_('0');
--
--	      if (__builtin_expect (exponent > exp_limit, 0))
-+	      if (__builtin_expect ((exponent > exp_limit / 10
-+				     || (exponent == exp_limit / 10
-+					 && c - L_('0') > exp_limit % 10)), 0))
- 		/* The exponent is too large/small to represent a valid
- 		   number.  */
- 		{
-@@ -843,7 +908,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 		  /* We have to take care for special situation: a joker
- 		     might have written "0.0e100000" which is in fact
- 		     zero.  */
--		  if (lead_zero == -1)
-+		  if (lead_zero == (size_t) -1)
- 		    result = negative ? -0.0 : 0.0;
- 		  else
- 		    {
-@@ -862,6 +927,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 		  /* NOTREACHED */
- 		}
- 
-+	      exponent *= 10;
-+	      exponent += c - L_('0');
-+
- 	      c = *++cp;
- 	    }
- 	  while (c >= L_('0') && c <= L_('9'));
-@@ -930,7 +998,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	}
- #endif
-       startp += lead_zero + decimal_len;
--      exponent -= base == 16 ? 4 * lead_zero : lead_zero;
-+      assert (lead_zero <= (base == 16
-+			    ? (uintmax_t) INTMAX_MAX / 4
-+			    : (uintmax_t) INTMAX_MAX));
-+      assert (lead_zero <= (base == 16
-+			    ? ((uintmax_t) exponent
-+			       - (uintmax_t) INTMAX_MIN) / 4
-+			    : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN)));
-+      exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero;
-       dig_no -= lead_zero;
-     }
- 
-@@ -972,7 +1047,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	}
- 
-       /* Adjust the exponent for the bits we are shifting in.  */
--      exponent += bits - 1 + (int_no - 1) * 4;
-+      assert (int_no <= (uintmax_t) (exponent < 0
-+				     ? (INTMAX_MAX - bits + 1) / 4
-+				     : (INTMAX_MAX - exponent - bits + 1) / 4));
-+      exponent += bits - 1 + ((intmax_t) int_no - 1) * 4;
- 
-       while (--dig_no > 0 && idx >= 0)
- 	{
-@@ -1024,13 +1102,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-      really integer digits or belong to the fractional part; i.e. we normalize
-      123e-2 to 1.23.  */
-   {
--    register int incr = (exponent < 0 ? MAX (-int_no, exponent)
--			 : MIN (dig_no - int_no, exponent));
-+    register intmax_t incr = (exponent < 0
-+			      ? MAX (-(intmax_t) int_no, exponent)
-+			      : MIN ((intmax_t) dig_no - (intmax_t) int_no,
-+				     exponent));
-     int_no += incr;
-     exponent -= incr;
-   }
- 
--  if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0))
-+  if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0))
-     {
-       __set_errno (ERANGE);
-       return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
-@@ -1215,7 +1295,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-        digits we should have enough bits for the result.  The remaining
-        decimal digits give us the information that more bits are following.
-        This can be used while rounding.  (Two added as a safety margin.)  */
--    if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2)
-+    if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2)
-       {
- 	dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2;
- 	more_bits = 1;
-@@ -1223,7 +1303,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-     else
-       more_bits = 0;
- 
--    neg_exp = dig_no - int_no - exponent;
-+    neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent;
- 
-     /* Construct the denominator.  */
-     densize = 0;
-diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c
-new file mode 100644
-index 0000000..668d55b
---- /dev/null
-+++ b/stdlib/tst-strtod-overflow.c
-@@ -0,0 +1,48 @@
-+/* Test for integer/buffer overflow in strtod.
-+   Copyright (C) 2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#define EXPONENT "e-2147483649"
-+#define SIZE 214748364
-+
-+static int
-+do_test (void)
-+{
-+  char *p = malloc (1 + SIZE + sizeof (EXPONENT));
-+  if (p == NULL)
-+    {
-+      puts ("malloc failed, cannot test for overflow");
-+      return 0;
-+    }
-+  p[0] = '1';
-+  memset (p + 1, '0', SIZE);
-+  memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT));
-+  double d = strtod (p, NULL);
-+  if (d != 0)
-+    {
-+      printf ("strtod returned wrong value: %a\n", d);
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.16-unlock-mutex.patch b/testing/glibc/glibc-2.16-unlock-mutex.patch
deleted file mode 100644
index 0649d3642..000000000
--- a/testing/glibc/glibc-2.16-unlock-mutex.patch
+++ /dev/null
@@ -1,775 +0,0 @@
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -206,7 +206,7 @@ tests = tst-typesizes \
- 	tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
- 	tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \
- 	tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
--	tst-cond20 tst-cond21 tst-cond22 tst-cond23 \
-+	tst-cond20 tst-cond21 tst-cond22 tst-cond23 tst-cond24 \
- 	tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \
- 	tst-robust6 tst-robust7 tst-robust8 tst-robust9 \
- 	tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \
-@@ -274,6 +275,7 @@ gen-as-const-headers = pthread-errnos.sym
- 
- LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
- 
-+LDFLAGS-tst-cond24 = $(no-as-needed) -lrt
- 
- include ../Makeconfig
- 
-diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-index d14d7de..6761c13 100644
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-@@ -212,8 +212,23 @@ __pthread_cond_timedwait:
- 	sete	24(%esp)
- 	je	41f
- 
--	/* Normal and PI futexes dont mix. Use normal futex functions only
--	   if the kernel does not support the PI futex functions.  */
-+	/* When a futex syscall with FUTEX_WAIT_REQUEUE_PI returns
-+	   successfully, it has already locked the mutex for us and the
-+	   pi_flag (24(%esp)) is set to denote that fact.  However, if another
-+	   thread changed the futex value before we entered the wait, the
-+	   syscall may return an EAGAIN and the mutex is not locked.  We go
-+	   ahead with a success anyway since later we look at the pi_flag to
-+	   decide if we got the mutex or not.  The sequence numbers then make
-+	   sure that only one of the threads actually wake up.  We retry using
-+	   normal FUTEX_WAIT only if the kernel returned ENOSYS, since normal
-+	   and PI futexes don't mix.
-+
-+	   Note that we don't check for EAGAIN specifically; we assume that the
-+	   only other error the futex function could return is EAGAIN (barring
-+	   the ETIMEOUT of course, for the timeout case in futex) since
-+	   anything else would mean an error in our function.  It is too
-+	   expensive to do that check for every call (which is  quite common in
-+	   case of a large number of threads), so it has been skipped.  */
- 	cmpl	$-ENOSYS, %eax
- 	jne	41f
- 	xorl	%ecx, %ecx
-@@ -273,9 +288,24 @@ __pthread_cond_timedwait:
- 	jne	9f
- 
- 15:	cmpl	$-ETIMEDOUT, %esi
--	jne	8b
-+	je	28f
-+
-+	/* We need to go back to futex_wait.  If we're using requeue_pi, then
-+	   release the mutex we had acquired and go back.  */
-+	movl	24(%esp), %edx
-+	test	%edx, %edx
-+	jz	8b
-+
-+	/* Adjust the mutex values first and then unlock it.  The unlock
-+	   should always succeed or else the kernel did not lock the mutex
-+	   correctly.  */
-+	movl	dep_mutex(%ebx), %eax
-+	call	__pthread_mutex_cond_lock_adjust
-+	xorl	%edx, %edx
-+	call	__pthread_mutex_unlock_usercnt
-+	jmp	8b
- 
--	addl	$1, wakeup_seq(%ebx)
-+28:	addl	$1, wakeup_seq(%ebx)
- 	adcl	$0, wakeup_seq+4(%ebx)
- 	addl	$1, cond_futex(%ebx)
- 	movl	$ETIMEDOUT, %esi
-diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-index 366de69..0af06ac 100644
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-@@ -136,7 +136,6 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	18f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- 	movl	%ebp, %edx
- 	xorl	%esi, %esi
-@@ -152,11 +151,22 @@ __pthread_cond_wait:
- 	sete	16(%esp)
- 	je	19f
- 
--	cmpl	$-EAGAIN, %eax
--	je	91f
--
--	/* Normal and PI futexes dont mix. Use normal futex functions only
--	   if the kernel does not support the PI futex functions.  */
-+	/* When a futex syscall with FUTEX_WAIT_REQUEUE_PI returns
-+	   successfully, it has already locked the mutex for us and the
-+	   pi_flag (16(%esp)) is set to denote that fact.  However, if another
-+	   thread changed the futex value before we entered the wait, the
-+	   syscall may return an EAGAIN and the mutex is not locked.  We go
-+	   ahead with a success anyway since later we look at the pi_flag to
-+	   decide if we got the mutex or not.  The sequence numbers then make
-+	   sure that only one of the threads actually wake up.  We retry using
-+	   normal FUTEX_WAIT only if the kernel returned ENOSYS, since normal
-+	   and PI futexes don't mix.
-+
-+	   Note that we don't check for EAGAIN specifically; we assume that the
-+	   only other error the futex function could return is EAGAIN since
-+	   anything else would mean an error in our function.  It is too
-+	   expensive to do that check for every call (which is 	quite common in
-+	   case of a large number of threads), so it has been skipped.  */
- 	cmpl	$-ENOSYS, %eax
- 	jne	19f
- 	xorl	%ecx, %ecx
-@@ -206,12 +216,12 @@ __pthread_cond_wait:
- 	cmpl	8(%esp), %edx
- 	jne	7f
- 	cmpl	4(%esp), %edi
--	je	8b
-+	je	22f
- 
- 7:	cmpl	%ecx, %edx
- 	jne	9f
- 	cmp	%eax, %edi
--	je	8b
-+	je	22f
- 
- 9:	addl	$1, woken_seq(%ebx)
- 	adcl	$0, woken_seq+4(%ebx)
-@@ -287,6 +297,22 @@ __pthread_cond_wait:
- 	jmp	20b
- 
- 	cfi_adjust_cfa_offset(-FRAME_SIZE);
-+
-+	/* We need to go back to futex_wait.  If we're using requeue_pi, then
-+	   release the mutex we had acquired and go back.  */
-+22:	movl	16(%esp), %edx
-+	test	%edx, %edx
-+	jz	8b
-+
-+	/* Adjust the mutex values first and then unlock it.  The unlock
-+	   should always succeed or else the kernel did not lock the mutex
-+	   correctly.  */
-+	movl	dep_mutex(%ebx), %eax
-+	call    __pthread_mutex_cond_lock_adjust
-+	xorl	%edx, %edx
-+	call	__pthread_mutex_unlock_usercnt
-+	jmp	8b
-+
- 	/* Initial locking failed.  */
- 1:
- #if cond_lock == 0
-@@ -400,77 +426,6 @@ __pthread_cond_wait:
- 	call	__lll_unlock_wake
- 	jmp	11b
- 
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--
--	/* Get internal lock.  */
--	movl	$1, %edx
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %edx, (%ebx)
--#else
--	cmpxchgl %edx, cond_lock(%ebx)
--#endif
--	jz	92f
--
--#if cond_lock == 0
--	movl	%ebx, %edx
--#else
--	leal	cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_lock_wait
--
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	addl	$1, cond_futex(%ebx)
--	movl	cond_futex(%ebx), %ebp
--
--	/* Unlock.  */
--	LOCK
--#if cond_lock == 0
--	subl	$1, (%ebx)
--#else
--	subl	$1, cond_lock(%ebx)
--#endif
--	je	93f
--#if cond_lock == 0
--	movl	%ebx, %eax
--#else
--	leal	cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_unlock_wake
--
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorl	%ecx, %ecx
--	movl	dep_mutex(%ebx), %edi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -651,10 +606,6 @@ __condvar_w_cleanup:
- 	.long	.LcleanupEND-.Lsub_cond_futex
- 	.long	__condvar_w_cleanup-.LSTARTCODE
- 	.uleb128  0
--	.long	.LcleanupSTART2-.LSTARTCODE
--	.long	.LcleanupEND2-.LcleanupSTART2
--	.long	__condvar_w_cleanup-.LSTARTCODE
--	.uleb128  0
- 	.long	.LcallUR-.LSTARTCODE
- 	.long	.LENDCODE-.LcallUR
- 	.long	0
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-index a1c8ca8..b669abb 100644
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-@@ -103,7 +103,7 @@ __pthread_cond_timedwait:
- 	mov	%RSI_LP, dep_mutex(%rdi)
- 
- 22:
--	xorl	%r15d, %r15d
-+	xorb	%r15b, %r15b
- 
- #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- #  ifdef PIC
-@@ -190,18 +190,39 @@ __pthread_cond_timedwait:
- 	movl	$SYS_futex, %eax
- 	syscall
- 
--	movl	$1, %r15d
-+	cmpl	$0, %eax
-+	sete	%r15b
-+
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
--	cmpq	$-4095, %rax
--	jnae	62f
-+	je	62f
-+
-+	/* When a futex syscall with FUTEX_WAIT_REQUEUE_PI returns
-+	   successfully, it has already locked the mutex for us and the
-+	   pi_flag (%r15b) is set to denote that fact.  However, if another
-+	   thread changed the futex value before we entered the wait, the
-+	   syscall may return an EAGAIN and the mutex is not locked.  We go
-+	   ahead with a success anyway since later we look at the pi_flag to
-+	   decide if we got the mutex or not.  The sequence numbers then make
-+	   sure that only one of the threads actually wake up.  We retry using
-+	   normal FUTEX_WAIT only if the kernel returned ENOSYS, since normal
-+	   and PI futexes don't mix.
-+
-+	   Note that we don't check for EAGAIN specifically; we assume that the
-+	   only other error the futex function could return is EAGAIN (barring
-+	   the ETIMEOUT of course, for the timeout case in futex) since
-+	   anything else would mean an error in our function.  It is too
-+	   expensive to do that check for every call (which is  quite common in
-+	   case of a large number of threads), so it has been skipped.  */
-+	cmpl    $-ENOSYS, %eax
-+	jne     62f
- 
- 	subq	$cond_futex, %rdi
- #endif
- 
- 61:	movl	$(FUTEX_WAIT_BITSET|FUTEX_PRIVATE_FLAG), %esi
--60:	xorl	%r15d, %r15d
-+60:	xorb	%r15b, %r15b
- 	xorl	%eax, %eax
- 	/* The following only works like this because we only support
- 	   two clocks, represented using a single bit.  */
-@@ -248,7 +269,23 @@ __pthread_cond_timedwait:
- 	ja	39f
- 
- 45:	cmpq	$-ETIMEDOUT, %r14
--	jne	38b
-+	je	99f
-+
-+	/* We need to go back to futex_wait.  If we're using requeue_pi, then
-+	   release the mutex we had acquired and go back.  */
-+	test	%r15b, %r15b
-+	jz	38b
-+
-+	/* Adjust the mutex values first and then unlock it.  The unlock
-+	   should always succeed or else the kernel did not lock the
-+	   mutex correctly.  */
-+	movq	%r8, %rdi
-+	callq	__pthread_mutex_cond_lock_adjust
-+	xorl	%esi, %esi
-+	callq	__pthread_mutex_unlock_usercnt
-+	/* Reload cond_var.  */
-+	movq	8(%rsp), %rdi
-+	jmp	38b
- 
- 99:	incq	wakeup_seq(%rdi)
- 	incl	cond_futex(%rdi)
-@@ -298,7 +335,7 @@ __pthread_cond_timedwait:
- 	/* If requeue_pi is used the kernel performs the locking of the
- 	   mutex. */
- 41:	movq	16(%rsp), %rdi
--	testl	%r15d, %r15d
-+	testb	%r15b, %r15b
- 	jnz	64f
- 
- 	callq	__pthread_mutex_cond_lock
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-index 6194852..ec403cd 100644
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-@@ -136,19 +136,36 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	61f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- 	movl	$SYS_futex, %eax
- 	syscall
- 
--	movl	$1, %r8d
--	cmpq	$-EAGAIN, %rax
--	je	91f
-+	cmpl	$0, %eax
-+	sete	%r8b
-+
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
--	cmpq	$-4095, %rax
--	jnae	62f
-+	je	62f
-+
-+	/* When a futex syscall with FUTEX_WAIT_REQUEUE_PI returns
-+	   successfully, it has already locked the mutex for us and the
-+	   pi_flag (%r8b) is set to denote that fact.  However, if another
-+	   thread changed the futex value before we entered the wait, the
-+	   syscall may return an EAGAIN and the mutex is not locked.  We go
-+	   ahead with a success anyway since later we look at the pi_flag to
-+	   decide if we got the mutex or not.  The sequence numbers then make
-+	   sure that only one of the threads actually wake up.  We retry using
-+	   normal FUTEX_WAIT only if the kernel returned ENOSYS, since normal
-+	   and PI futexes don't mix.
-+
-+	   Note that we don't check for EAGAIN specifically; we assume that the
-+	   only other error the futex function could return is EAGAIN since
-+	   anything else would mean an error in our function.  It is too
-+	   expensive to do that check for every call (which is 	quite common in
-+	   case of a large number of threads), so it has been skipped.  */
-+	cmpl	$-ENOSYS, %eax
-+	jne	62f
- 
- # ifndef __ASSUME_PRIVATE_FUTEX
- 	movl	$FUTEX_WAIT, %esi
-@@ -161,7 +178,7 @@ __pthread_cond_wait:
- #else
- 	orl	%fs:PRIVATE_FUTEX, %esi
- #endif
--60:	xorl	%r8d, %r8d
-+60:	xorb	%r8b, %r8b
- 	movl	$SYS_futex, %eax
- 	syscall
- 
-@@ -191,10 +208,10 @@ __pthread_cond_wait:
- 	jne	16f
- 
- 	cmpq	24(%rsp), %r9
--	jbe	8b
-+	jbe	19f
- 
- 	cmpq	%rax, %r9
--	jna	8b
-+	jna	19f
- 
- 	incq	woken_seq(%rdi)
- 
-@@ -236,7 +253,7 @@ __pthread_cond_wait:
- 	/* If requeue_pi is used the kernel performs the locking of the
- 	   mutex. */
- 11:	movq	16(%rsp), %rdi
--	testl	%r8d, %r8d
-+	testb	%r8b, %r8b
- 	jnz	18f
- 
- 	callq	__pthread_mutex_cond_lock
-@@ -253,6 +270,23 @@ __pthread_cond_wait:
- 	xorl	%eax, %eax
- 	jmp	14b
- 
-+	/* We need to go back to futex_wait.  If we're using requeue_pi, then
-+	   release the mutex we had acquired and go back.  */
-+19:	testb	%r8b, %r8b
-+	jz	8b
-+
-+	/* Adjust the mutex values first and then unlock it.  The unlock
-+	   should always succeed or else the kernel did not lock the mutex
-+	   correctly.  */
-+	movq	16(%rsp), %rdi
-+	callq	__pthread_mutex_cond_lock_adjust
-+	movq	%rdi, %r8
-+	xorl	%esi, %esi
-+	callq	__pthread_mutex_unlock_usercnt
-+	/* Reload cond_var.  */
-+	movq	8(%rsp), %rdi
-+	jmp	8b
-+
- 	/* Initial locking failed.  */
- 1:
- #if cond_lock != 0
-@@ -331,69 +365,6 @@ __pthread_cond_wait:
- 13:	movq	%r10, %rax
- 	jmp	14b
- 
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--	movq	8(%rsp), %rdi
--
--	/* Get internal lock.  */
--	movl	$1, %esi
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %esi, (%rdi)
--#else
--	cmpxchgl %esi, cond_lock(%rdi)
--#endif
--	jz	92f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	callq	__lll_lock_wait
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	incl	cond_futex(%rdi)
--	movl	cond_futex(%rdi), %edx
--
--	/* Release internal lock.  */
--	LOCK
--#if cond_lock == 0
--	decl	(%rdi)
--#else
--	decl	cond_lock(%rdi)
--#endif
--	jz	93f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	/* The call preserves %rdx.  */
--	callq	__lll_unlock_wake
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorq	%r10, %r10
--	mov	dep_mutex(%rdi), %R8_LP
--	leaq	cond_futex(%rdi), %rdi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -547,10 +518,6 @@ __condvar_cleanup1:
- 	.uleb128 .LcleanupEND-.LcleanupSTART
- 	.uleb128 __condvar_cleanup1-.LSTARTCODE
- 	.uleb128 0
--	.uleb128 .LcleanupSTART2-.LSTARTCODE
--	.uleb128 .LcleanupEND2-.LcleanupSTART2
--	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
- 	.uleb128 .LcallUR-.LSTARTCODE
- 	.uleb128 .LENDCODE-.LcallUR
- 	.uleb128 0
-diff --git a/nptl/tst-cond24.c b/nptl/tst-cond24.c
-new file mode 100644
-index 0000000..2eb2df1
---- /dev/null
-+++ b/nptl/tst-cond24.c
-@@ -0,0 +1,249 @@
-+/* Verify that condition variables synchronized by PI mutexes don't hang.
-+   Copyright (C) 2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <pthread.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/syscall.h>
-+#include <unistd.h>
-+#include <sys/time.h>
-+#include <time.h>
-+
-+#define THREADS_NUM 5
-+#define MAXITER 50000
-+
-+static pthread_mutex_t mutex;
-+static pthread_mutexattr_t mutex_attr;
-+static pthread_cond_t cond;
-+static pthread_t threads[THREADS_NUM];
-+static int pending = 0;
-+
-+typedef void * (*threadfunc) (void *);
-+
-+void *
-+thread_fun_timed (void *arg)
-+{
-+  int *ret = arg;
-+  int rv, i;
-+
-+  printf ("Started thread_fun_timed[%d]\n", *ret);
-+
-+  for (i = 0; i < MAXITER / THREADS_NUM; i++)
-+    {
-+      rv = pthread_mutex_lock (&mutex);
-+      if (rv)
-+        {
-+	  printf ("pthread_mutex_lock: %s(%d)\n", strerror (rv), rv);
-+	  *ret = 1;
-+	  goto out;
-+	}
-+
-+      while (!pending)
-+	{
-+	  struct timespec ts;
-+	  clock_gettime(CLOCK_REALTIME, &ts);
-+	  ts.tv_sec += 20;
-+	  rv = pthread_cond_timedwait (&cond, &mutex, &ts);
-+
-+	  /* There should be no timeout either.  */
-+	  if (rv)
-+            {
-+	      printf ("pthread_cond_wait: %s(%d)\n", strerror (rv), rv);
-+	      *ret = 1;
-+	      goto out;
-+	    }
-+	}
-+
-+      pending--;
-+
-+      rv = pthread_mutex_unlock (&mutex);
-+      if (rv)
-+        {
-+	  printf ("pthread_mutex_unlock: %s(%d)\n", strerror (rv), rv);
-+	  *ret = 1;
-+	  goto out;
-+	}
-+    }
-+
-+  *ret = 0;
-+
-+out:
-+  return ret;
-+}
-+
-+void *
-+thread_fun (void *arg)
-+{
-+  int *ret = arg;
-+  int rv, i;
-+
-+  printf ("Started thread_fun[%d]\n", *ret);
-+
-+  for (i = 0; i < MAXITER / THREADS_NUM; i++)
-+    {
-+      rv = pthread_mutex_lock (&mutex);
-+      if (rv)
-+        {
-+	  printf ("pthread_mutex_lock: %s(%d)\n", strerror (rv), rv);
-+	  *ret = 1;
-+	  goto out;
-+	}
-+
-+      while (!pending)
-+	{
-+	  rv = pthread_cond_wait (&cond, &mutex);
-+
-+	  if (rv)
-+            {
-+	      printf ("pthread_cond_wait: %s(%d)\n", strerror (rv), rv);
-+	      *ret = 1;
-+	      goto out;
-+	    }
-+	}
-+
-+      pending--;
-+
-+      rv = pthread_mutex_unlock (&mutex);
-+      if (rv)
-+        {
-+	  printf ("pthread_mutex_unlock: %s(%d)\n", strerror (rv), rv);
-+	  *ret = 1;
-+	  goto out;
-+	}
-+    }
-+
-+  *ret = 0;
-+
-+out:
-+  return ret;
-+}
-+
-+static int
-+do_test_wait (threadfunc f)
-+{
-+  int i;
-+  int rv;
-+  int counter = 0;
-+  int retval[THREADS_NUM];
-+
-+  puts ("Starting test");
-+
-+  rv = pthread_mutexattr_init (&mutex_attr);
-+  if (rv)
-+    {
-+      printf ("pthread_mutexattr_init: %s(%d)\n", strerror (rv), rv);
-+      return 1;
-+    }
-+
-+  rv = pthread_mutexattr_setprotocol (&mutex_attr, PTHREAD_PRIO_INHERIT);
-+  if (rv)
-+    {
-+      printf ("pthread_mutexattr_setprotocol: %s(%d)\n", strerror (rv), rv);
-+      return 1;
-+    }
-+
-+  rv = pthread_mutex_init (&mutex, &mutex_attr);
-+  if (rv)
-+    {
-+      printf ("pthread_mutex_init: %s(%d)\n", strerror (rv), rv);
-+      return 1;
-+    }
-+
-+  rv = pthread_cond_init (&cond, NULL);
-+  if (rv)
-+    {
-+      printf ("pthread_cond_init: %s(%d)\n", strerror (rv), rv);
-+      return 1;
-+    }
-+
-+  for (i = 0; i < THREADS_NUM; i++)
-+    {
-+      retval[i] = i;
-+      rv = pthread_create (&threads[i], NULL, f, &retval[i]);
-+      if (rv)
-+        {
-+          printf ("pthread_create: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+    }
-+
-+  for (; counter < MAXITER; counter++)
-+    {
-+      rv = pthread_mutex_lock (&mutex);
-+      if (rv)
-+        {
-+          printf ("pthread_mutex_lock: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+
-+      if (!(counter % 100))
-+	printf ("counter: %d\n", counter);
-+      pending += 1;
-+
-+      rv = pthread_cond_signal (&cond);
-+      if (rv)
-+        {
-+          printf ("pthread_cond_signal: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+
-+      rv = pthread_mutex_unlock (&mutex);
-+      if (rv)
-+        {
-+          printf ("pthread_mutex_unlock: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+    }
-+
-+  for (i = 0; i < THREADS_NUM; i++)
-+    {
-+      void *ret;
-+      rv = pthread_join (threads[i], &ret);
-+      if (rv)
-+        {
-+          printf ("pthread_join: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+      if (ret && *(int *)ret)
-+        {
-+	  printf ("Thread %d returned with an error\n", i);
-+	  return 1;
-+	}
-+    }
-+
-+  return 0;
-+}
-+
-+static int
-+do_test (void)
-+{
-+  puts ("Testing pthread_cond_wait");
-+  int ret = do_test_wait (thread_fun);
-+  if (ret)
-+    return ret;
-+
-+  puts ("Testing pthread_cond_timedwait");
-+  return do_test_wait (thread_fun_timed);
-+}
-+
-+#define TIMEOUT 10
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch
deleted file mode 100644
index 16f84c536..000000000
--- a/testing/glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c
-index 9c00dc0..f5d4df8 100644
---- a/nptl/sysdeps/pthread/pt-initfini.c
-+++ b/nptl/sysdeps/pthread/pt-initfini.c
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
-
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
-diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
-index 64ef400..726b1df 100644
---- a/sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
-
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
-
- /* For Linux we can use the system call table in the header file
-        /usr/include/asm/unistd.h
diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install
deleted file mode 100644
index 4486a3b2d..000000000
--- a/testing/glibc/glibc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
-
-post_upgrade() {
-  ldconfig -r .
-  [[ ! -e sys/fs/cgroup/systemd && -x sbin/init ]] && init u
-  locale-gen
-  
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-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/glibc/locale-gen b/testing/glibc/locale-gen
deleted file mode 100755
index 5aff344c4..000000000
--- a/testing/glibc/locale-gen
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LOCALEGEN=/etc/locale.gen
-LOCALES=/usr/share/i18n/locales
-if [ -n "$POSIXLY_CORRECT" ]; then
-  unset POSIXLY_CORRECT
-fi
-
-
-[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
-
-# Remove all old locale dir and locale-archive before generating new
-# locale data.
-rm -rf /usr/lib/locale/* || true
-
-umask 022
-
-is_entry_ok() {
-  if [ -n "$locale" -a -n "$charset" ] ; then
-    true
-  else
-    echo "error: Bad entry '$locale $charset'"
-    false
-  fi
-}
-
-echo "Generating locales..."
-while read locale charset; do \
-	case $locale in \#*) continue;; "") continue;; esac; \
-	is_entry_ok || continue
-	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
-	echo -n ".$charset"; \
-	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
-	echo -n '...'; \
-        if [ -f $LOCALES/$locale ]; then input=$locale; else \
-        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
-	localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
-	echo ' done'; \
-done < $LOCALEGEN
-echo "Generation complete."
diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/testing/glibc/locale.gen.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration file for locale-gen
-#
-# lists of locales that are to be generated by the locale-gen command.
-#
-# Each line is of the form:
-#
-#     <locale> <charset>
-#
-#  where <locale> is one of the locales given in /usr/share/i18n/locales
-#  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
-#
-#  Examples:
-#  en_US ISO-8859-1
-#  en_US.UTF-8 UTF-8
-#  de_DE ISO-8859-1
-#  de_DE@euro ISO-8859-15
-#
-#  The locale-gen command will generate all the locales,
-#  placing them in /usr/lib/locale.
-#
-#  A list of supported locales is included in this file.
-#  Uncomment the ones you need.
-#
diff --git a/testing/glibc/nscd b/testing/glibc/nscd
deleted file mode 100755
index 8b14f2a3f..000000000
--- a/testing/glibc/nscd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/nscd`
-case "$1" in
-  start)
-    stat_busy "Starting nscd"
-    # create necessary directories if they don't already exist
-    mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null
-    # remove stale files
-    rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null
-    [ -z "$PID" ] && /usr/sbin/nscd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon nscd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nscd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon nscd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/glibc/nscd.rcd b/testing/glibc/nscd.rcd
deleted file mode 100755
index 4b48ab002..000000000
--- a/testing/glibc/nscd.rcd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name="nscd"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-	start)
-		stat_busy "Starting $daemon_name daemon"
-		PID=$(get_pid)
-		if [[ -z $PID ]]; then
-			rm -f /run/$daemon_name.pid
-			mkdir -p /run/nscd /var/db/nscd
-			rm -f /run/nscd/* /var/db/nscd/*
-			$daemon_name
-			if (( $? > 0 )); then
-				stat_fail
-				exit 1
-			else
-				echo $(get_pid) > /var/run/$daemon_name.pid
-				add_daemon $daemon_name
-				stat_done
-			fi
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-
-	stop)
-		stat_busy "Stopping $daemon_name daemon"
-		PID=$(get_pid)
-		[[ -n $PID ]] && nscd --shutdown &> /dev/null
-		if (( $? > 0 )); then
-			stat_fail
-			exit 1
-		else
-			rm -f /run/$daemon_name.pid &> /dev/null
-			rm_daemon $daemon_name
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 3
-		$0 start
-		;;
-
-	status)
-		stat_busy "Checking $daemon_name status";
-		ck_status $daemon_name
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/glibc/nscd.service b/testing/glibc/nscd.service
deleted file mode 100644
index bc80a0730..000000000
--- a/testing/glibc/nscd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-After=syslog.target
- 
-[Service]
-Type=forking
-ExecStart=/usr/sbin/nscd
-ExecStop=/usr/sbin/nscd --shutdown
-ExecReload=/usr/sbin/nscd -i passwd
-ExecReload=/usr/sbin/nscd -i group
-ExecReload=/usr/sbin/nscd -i hosts
-ExecReload=/usr/sbin/nscd -i services
-Restart=always
-PIDFile=/run/nscd/nscd.pid
- 
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/glibc/nscd.tmpfiles b/testing/glibc/nscd.tmpfiles
deleted file mode 100644
index 8a24a785e..000000000
--- a/testing/glibc/nscd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/nscd 0755 root root
diff --git a/testing/glibmm/PKGBUILD b/testing/glibmm/PKGBUILD
deleted file mode 100644
index 53b80d6b3..000000000
--- a/testing/glibmm/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169462 2012-10-21 15:00:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=glibmm
-pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.34.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://www.gtkmm.org/"
-sha256sums=('ae5b8221fdace1771d2ae401b52afdca8b64ee12bd0f956fb4e92d482ddc1cbf')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package_glibmm() {
-  pkgdesc="Glib-- (glibmm) is a C++ interface for glib"
-  depends=('glib2' 'libsigc++2.0')
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-  make DESTDIR="$pkgdir" install
-}
-
-package_glibmm-docs() {
-  pkgdesc="Developer documentation for glibmm"
-  cd "$pkgbase-$pkgver/docs"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/glu/PKGBUILD b/testing/glu/PKGBUILD
deleted file mode 100644
index 0e1e04a8c..000000000
--- a/testing/glu/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168200 2012-10-06 20:05:28Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=glu
-pkgver=9.0.0
-pkgrel=1
-pkgdesc="Mesa OpenGL Utility library"
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/mesa/glu/"
-license=('LGPL')
-depends=('libgl')
-makedepends=('mesa')
-options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
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 d7d9650dc..000000000
--- a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Simplified by Kay Sievers
-# https://bugzilla.redhat.com/show_bug.cgi?id=733326
-
-KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
diff --git a/testing/gnome-bluetooth/PKGBUILD b/testing/gnome-bluetooth/PKGBUILD
deleted file mode 100644
index 5191ec4e8..000000000
--- a/testing/gnome-bluetooth/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169238 2012-10-18 19:27:33Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-bluetooth
-pkgver=3.6.0
-pkgrel=2
-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' 'libnotify')
-makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl')
-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=('021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306'
-            '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-desktop-update \
-    --disable-icon-update \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 -D ../61-gnome-bluetooth-rfkill.rules \
-      "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
-}
diff --git a/testing/gnome-bluetooth/gnome-bluetooth.install b/testing/gnome-bluetooth/gnome-bluetooth.install
deleted file mode 100644
index 8c991877f..000000000
--- a/testing/gnome-bluetooth/gnome-bluetooth.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  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 937b0f330..000000000
--- a/testing/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169237 2012-10-18 19:27:30Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.6.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' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk')
-makedepends=('intltool' 'yelp-tools')
-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=('c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9')
-
-build(){
-  cd $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
-
-  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 $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 096682447..000000000
--- a/testing/gnome-contacts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169235 2012-10-18 19:27:23Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-contacts
-pkgver=3.6.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' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
-makedepends=('intltool' 'vala')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2cc93827511cd28cc854ce4c36924a437350f7d61b6b0b4140a32833be683f95')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/gnome-contacts
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-contacts/gnome-contacts.install b/testing/gnome-contacts/gnome-contacts.install
deleted file mode 100644
index c19349f72..000000000
--- a/testing/gnome-contacts/gnome-contacts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD
deleted file mode 100644
index 1c8bf72c9..000000000
--- a/testing/gnome-control-center/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 169513 2012-10-22 21:13:34Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.6.2
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
-         'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
-         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3ab5aa304b424006c9f38ce2ff50afbf38e167ca632c64509bf30aa3c786afb7')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb \
-      --without-cheese
-
-  #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 $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 079e0fa34..000000000
--- a/testing/gnome-control-center/gnome-control-center.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD
deleted file mode 100644
index 1bb318788..000000000
--- a/testing/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169233 2012-10-18 19:27:16Z jgc $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.6.1
-pkgrel=1
-epoch=1
-pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1c4954d143d696263888ea2061b2854f8c4094d33dfe51a39fb41f0a8051a174')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-desktop \
-      --with-gnome-distributor="Arch Linux"
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-dictionary/PKGBUILD b/testing/gnome-dictionary/PKGBUILD
deleted file mode 100644
index 1e81d2ca6..000000000
--- a/testing/gnome-dictionary/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169232 2012-10-18 19:27:12Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gnome-dictionary
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Look up words in dictionary sources"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3')
-makedepends=('intltool' 'itstool' 'docbook-xsl')
-install=$pkgname.install
-options=(!libtool)
-groups=('gnome-extra')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-dictionary/gnome-dictionary.install b/testing/gnome-dictionary/gnome-dictionary.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/testing/gnome-dictionary/gnome-dictionary.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-disk-utility/PKGBUILD b/testing/gnome-disk-utility/PKGBUILD
deleted file mode 100644
index d8d3b1868..000000000
--- a/testing/gnome-disk-utility/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169231 2012-10-18 19:27:09Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Silvio Knizek (killermoehre)
-
-pkgname=gnome-disk-utility
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Disk Management Utility for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils')
-makedepends=('intltool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
-install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-disk-utility/gnome-disk-utility.install b/testing/gnome-disk-utility/gnome-disk-utility.install
deleted file mode 100644
index 8b17fa3d4..000000000
--- a/testing/gnome-disk-utility/gnome-disk-utility.install
+++ /dev/null
@@ -1,13 +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
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-documents/PKGBUILD b/testing/gnome-documents/PKGBUILD
deleted file mode 100644
index 18a05b7e7..000000000
--- a/testing/gnome-documents/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169605 2012-10-24 09:10:49Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-documents
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Documents Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata'
-         'tracker' 'libzapojit')
-makedepends=('intltool')
-optdepends=('unoconv: Support for Libreoffice document types')
-options=('!libtool')
-install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('16a241db8abcac69c80e4c1a4f3319fbc0c1a99fb5f707eca45368043cc809ac')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/gnome-documents
-  make
-}
-
-package() {
-  cd $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 1571179ca..000000000
--- a/testing/gnome-documents/gnome-documents.install
+++ /dev/null
@@ -1,13 +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
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-font-viewer/PKGBUILD b/testing/gnome-font-viewer/PKGBUILD
deleted file mode 100644
index 6eef0419d..000000000
--- a/testing/gnome-font-viewer/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#  $Id: PKGBUILD 169229 2012-10-18 19:27:00Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-font-viewer
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME font viewer and thumbnailer"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'desktop-file-utils' 'gnome-desktop')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-font-viewer.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3625c9f70ef227cd6cdaa1fea4990d87ba12ba3681e105cf5db731edec208e74')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-font-viewer/gnome-font-viewer.install b/testing/gnome-font-viewer/gnome-font-viewer.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/gnome-font-viewer/gnome-font-viewer.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/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD
deleted file mode 100644
index b235215d0..000000000
--- a/testing/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169228 2012-10-18 19:26:55Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
-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:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static --disable-schemas-compile \
-      --with-scores-user=root --with-scores-group=games \
-      --enable-introspection=yes
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Remove all scores, we generate them from postinstall
-  rm -rf "$pkgdir/var"
-
-  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 2fad5db0b..000000000
--- a/testing/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,122 +0,0 @@
-_scores=(glines.Small.scores
-	glines.Medium.scores
-	glines.Large.scores
-	gnibbles.4.0.scores
-	gnibbles.3.0.scores
-	gnibbles.2.0.scores
-	gnibbles.1.0.scores
-	gnibbles.4.1.scores
-	gnibbles.3.1.scores
-	gnibbles.2.1.scores
-	gnibbles.1.1.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnomine.Small.scores
-	gnomine.Medium.scores
-	gnomine.Large.scores
-	gnomine.Custom.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gnotski.1.scores
-	gnotski.2.scores
-	gnotski.3.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.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.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.30.scores
-	gnotski.31.scores
-	gnotski.32.scores
-	gnotski.33.scores
-	gnotski.34.scores
-	gnotski.35.scores
-	gnotski.36.scores
-	gnotski.37.scores
-	gtali.Regular.scores
-	gtali.Colors.scores
-	gnome-mahjongg.easy.scores
-	gnome-mahjongg.difficult.scores
-	gnome-mahjongg.confounding.scores
-	gnome-mahjongg.pyramid.scores
-	gnome-mahjongg.tictactoe.scores
-	gnome-mahjongg.cloud.scores
-	gnome-mahjongg.dragon.scores
-	gnome-mahjongg.bridges.scores
-	gnome-mahjongg.ziggurat.scores
-	quadrapassel.scores
-	swell-foop.small.scores
-	swell-foop.normal.scores
-	swell-foop.large.scores)
-
-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
-
-  for score in "${_scores[@]}" ; do
-    if [ -e "var/games/$score" ]; then
-      continue
-    fi
-
-    touch "var/games/$score"
-    chown root:games "var/games/$score"
-    chmod 664 "var/games/$score"
-  done
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  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 6adece782..000000000
--- a/testing/gnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#$Id: PKGBUILD 169225 2012-10-18 19:26:46Z jgc $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'gcr' 'libcap-ng')
-makedepends=('intltool')
-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=('0c3a2ccc1744ce681fa7eb8d5e3e94d1712e932068a36ce7076222eb82b25aa5')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring \
-      --with-pam-dir=/usr/lib/security --with-root-certs=/etc/ssl/certs \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$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 c351377a2..000000000
--- a/testing/gnome-keyring/gnome-keyring.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/gnome-menus/PKGBUILD b/testing/gnome-menus/PKGBUILD
deleted file mode 100644
index 57da0011c..000000000
--- a/testing/gnome-menus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169224 2012-10-18 19:26:43Z jgc $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
-depends=('glib2' 'python2-gobject')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        menus.patch)
-sha256sums=('523ac10729e28f9acde4785e61dcb895828fd89e39b38b68f6c14ec815805a0b'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
-      --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package(){
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
-}
diff --git a/testing/gnome-menus/menus.patch b/testing/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/testing/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/testing/gnome-nettool/PKGBUILD b/testing/gnome-nettool/PKGBUILD
deleted file mode 100644
index 0d56224e0..000000000
--- a/testing/gnome-nettool/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169223 2012-10-18 19:26:38Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@nospam.gmail.com>
-
-pkgname=gnome-nettool
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A Collection of GNOME3 Networking Tools."
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
-optdepends=('nmap: Port scanning'
-            'net-tools: Network statistics')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-nettool/gnome-nettool.install b/testing/gnome-nettool/gnome-nettool.install
deleted file mode 100644
index e5dfaf4a5..000000000
--- a/testing/gnome-nettool/gnome-nettool.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-online-accounts/PKGBUILD b/testing/gnome-online-accounts/PKGBUILD
deleted file mode 100644
index 2a31df997..000000000
--- a/testing/gnome-online-accounts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169222 2012-10-18 19:26:35Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-online-accounts
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME service to access online accounts"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
-makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-options=(!libtool)
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2a88772873935b1c23e8e6b7a2333d8cfb225755aba22e0977129f13351028f7')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
-  make
-}
-
-package() {
-  cd "$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 525ecff63..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 f5b8ab969..000000000
--- a/testing/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169281 2012-10-18 19:45:55Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.6.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'
-         'gconf' 'telepathy-glib')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6a8058df6263af35b0e430514f7e16d1b4df095365242d39e170cfc451a328b6')
-
-build() {
-  cd "$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 "$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 0f9324937..000000000
--- a/testing/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
-  gconfpkg --install $pkgname
-  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() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  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 2775223dd..000000000
--- a/testing/gnome-phone-manager/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169299 2012-10-18 22:31:09Z jgc $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-phone-manager
-pkgver=0.68
-pkgrel=3
-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' 'gconf')
-makedepends=('intltool')
-options=('!emptydirs' '!libtool')
-install=gnome-phone-manager.install
-source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz
-        gnome-phone-manager-0.68-eds.patch)
-sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15'
-            '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../gnome-phone-manager-0.68-eds.patch
-  ./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-0.68-eds.patch b/testing/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
deleted file mode 100644
index 2a36de13a..000000000
--- a/testing/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c
-index dc8e2e3..d95e5b9 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.c
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c
-@@ -38,11 +38,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- 
--#include <libedataserver/e-source.h>
--#include <libebook/e-book.h>
--#include <libebook/e-book-view.h>
--#include <libebook/e-contact.h>
--
- #include "e-contact-entry.h"
- #include "econtactentry-marshal.h"
- 
-@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 };
- /* Properties */
- enum {
-   PROP_0, /* TODO: why? */
--  PROP_SOURCE_LIST,
-+  PROP_REGISTRY,
-   PROP_COMPLETE_LENGTH,
- };
- 
-@@ -70,7 +65,7 @@ enum {
- struct EContactEntryPriv {
-   GtkEntryCompletion *completion;
-   GtkListStore *store;
--  ESourceList *source_list;
-+  ESourceRegistry *registry;
-   /* A list of EntryLookup structs we are searching */
-   GList *lookup_entries;
-   /* Number of characters to start searching at */
-@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact)
-   emails = e_contact_get (contact, E_CONTACT_EMAIL);
-   for (l = emails; l != NULL; l = l->next) {
-     item = g_new0 (EContactEntyItem, 1);
--    item->identifier = item->identifier = g_strdup (l->data);
-+    item->identifier = g_strdup (l->data);
-     item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
- 
-     items = g_list_prepend (items, item);
-@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
-       return;
- 
-     photo = e_contact_get (contact, E_CONTACT_PHOTO);
--#ifndef HAVE_ECONTACTPHOTOTYPE
--    if (photo) {
--#else
-     if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
--#endif
-       GdkPixbufLoader *loader;
- 
-       loader = gdk_pixbuf_loader_new ();
- 
--#ifndef HAVE_ECONTACTPHOTOTYPE
--      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
--			      photo->length, NULL))
--#else
-       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
- 			      photo->data.inlined.length, NULL))
--#endif
-         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- 
-       if (pixbuf) {
-@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
-  * The query on the EBookView has completed.
-  */
- static void
--view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
-+view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data)
- {
-   EntryLookup *lookup;
-   g_return_if_fail (user_data != NULL);
--  /* TODO: handle status != OK */
--  g_return_if_fail (status == E_BOOK_ERROR_OK);
-   g_return_if_fail (book_view != NULL);
- 
-   lookup = (EntryLookup*)user_data;
-   g_object_unref (lookup->bookview);
-+  lookup->bookview = NULL;
- }
- 
- /**
-@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
-   lookup->bookview = book_view;
-   g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
-   
--  g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup);
--  g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup);
-+  g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup);
-+  g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup);
-   
-   e_book_view_start (book_view);
- }
-@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
-       if (lookup->bookview) {
-         e_book_view_stop (lookup->bookview);
-         g_object_unref (lookup->bookview);
-+        lookup->bookview = NULL;
-       }
-     }
-     
-@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
-       if (!lookup->open)
-         continue;
-       
--      if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) {
-+      if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) {
-         g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
-       }
-     }
-@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
-  */
- 
- void
--e_contact_entry_set_source_list (EContactEntry *entry,
--    				  ESourceList *source_list)
-+e_contact_entry_set_registry (EContactEntry *entry,
-+    			      ESourceRegistry *registry)
- {
-+  GList *list, *link;
-+  const gchar *extension_name;
-   GError *error = NULL;
--  GSList *list, *l;
- 
-   g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
- 
-@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry,
-     g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
-     g_list_free (entry->priv->lookup_entries);
-   }
--  if (entry->priv->source_list) {
--    g_object_unref (entry->priv->source_list);
-+  if (entry->priv->registry) {
-+    g_object_unref (entry->priv->registry);
-   }
- 
-   /* If we have no new sources, disable and return here */
--  if (source_list == NULL) {
-+  if (registry == NULL) {
-     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
--    entry->priv->source_list = NULL;
-+    entry->priv->registry = NULL;
-     entry->priv->lookup_entries = NULL;
-     return;
-   }
- 
--  entry->priv->source_list = source_list;
--  /* So that the list isn't going away underneath us */
--  g_object_ref (entry->priv->source_list);
-+  entry->priv->registry = registry;
-+  /* So that the registry isn't going away underneath us */
-+  g_object_ref (entry->priv->registry);
- 
--  /* That gets us a list of ESourceGroup */
--  list = e_source_list_peek_groups (source_list);
-   entry->priv->lookup_entries = NULL;
- 
--  for (l = list; l != NULL; l = l->next) {
--    ESourceGroup *group = l->data;
--    GSList *sources = NULL, *m;
--    /* That should give us a list of ESource */
--    sources = e_source_group_peek_sources (group);
--    for (m = sources; m != NULL; m = m->next) {
--      ESource *source = m->data;
--      ESource *s = e_source_copy (source);
--      EntryLookup *lookup;
--      char *uri;
-+  extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
-+  list = e_source_registry_list_sources (registry, extension_name);
- 
--      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
--      e_source_set_absolute_uri (s, uri);
--      g_free (uri);
-+  for (link = list; link != NULL; link = g_list_next (link)) {
-+    ESource *source = E_SOURCE (link->data);
-+    EntryLookup *lookup;
- 
--      /* Now add those to the lookup entries list */
--      lookup = g_new0 (EntryLookup, 1);
--      lookup->entry = entry;
--      lookup->status = E_BOOK_ERROR_OK;
--      lookup->open = FALSE;
-+    /* Now add those to the lookup entries list */
-+    lookup = g_new0 (EntryLookup, 1);
-+    lookup->entry = entry;
-+    lookup->status = E_BOOK_ERROR_OK;
-+    lookup->open = FALSE;
- 
--      if ((lookup->book = e_book_new (s, &error)) == NULL) {
--        /* TODO handle this better, fire the error signal I guess */
-+    if ((lookup->book = e_book_new (source, &error)) == NULL) {
-+      /* TODO handle this better, fire the error signal I guess */
-+      if (error) {
-         g_warning ("%s", error->message);
--	g_error_free (error);
--	g_free (lookup);
--      } else {
--        entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
--	e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
-+        g_error_free (error);
-+        error = NULL;
-       }
--
--      g_object_unref (s);
-+      g_free (lookup);
-+    } else {
-+      entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
-+      e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
-     }
-   }
- 
-@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry,
-     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
- }
- 
--ESourceList *
--e_contact_entry_get_source_list (EContactEntry *entry)
-+ESourceRegistry *
-+e_contact_entry_get_registry (EContactEntry *entry)
- {
-   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL);
- 
--  return entry->priv->source_list;
-+  return entry->priv->registry;
- }
- 
- void
-@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue *
-   entry = E_CONTACT_ENTRY (object);
-   
-   switch (property_id) {
--  case PROP_SOURCE_LIST:
--    e_contact_entry_set_source_list (entry, g_value_get_object (value));
-+  case PROP_REGISTRY:
-+    e_contact_entry_set_registry (entry, g_value_get_object (value));
-     break;
-   case PROP_COMPLETE_LENGTH:
-     e_contact_entry_set_complete_length (entry, g_value_get_int (value));
-@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value,
-   entry = E_CONTACT_ENTRY (object);
-   
-   switch (property_id) {
--  case PROP_SOURCE_LIST:
--    g_value_set_object (value, e_contact_entry_get_source_list (entry));
-+  case PROP_REGISTRY:
-+    g_value_set_object (value, e_contact_entry_get_registry (entry));
-     break;
-   case PROP_COMPLETE_LENGTH:
-     g_value_set_int (value, e_contact_entry_get_complete_length (entry));
-@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object)
-     g_list_free (entry->priv->lookup_entries);
-     g_object_unref (entry->priv->completion);
-     g_object_unref (entry->priv->store);
--    g_object_unref (entry->priv->source_list);
-+    g_object_unref (entry->priv->registry);
- 
-     if (entry->priv->display_destroy) {
-       entry->priv->display_destroy (entry->priv->display_func);
-@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object)
- static void
- reset_search_fields (EContactEntry *entry)
- {
--  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 };
-+  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 };
- 
-   g_free (entry->priv->search_fields);
-   entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
-@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass)
-   object_class->finalize = e_contact_entry_finalize;
- 
-   /* Properties */
--  g_object_class_install_property (object_class, PROP_SOURCE_LIST,
--                                   g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.",
--                                                        E_TYPE_SOURCE_LIST, G_PARAM_READWRITE));
-+  g_object_class_install_property (object_class, PROP_REGISTRY,
-+                                   g_param_spec_object ("registry", "Registry", "Data source registry.",
-+                                                        E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE));
-   
-   g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH,
-                                    g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.",
-@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup)
-   if (lookup->bookview) {
-     g_warning("EBookView still around");
-     g_object_unref (lookup->bookview);
-+    lookup->bookview = NULL;
-   }
-   if (lookup->book) {
-     g_object_unref (lookup->book);
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h
-index bf6b39b..6fedef7 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.h
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h
-@@ -23,10 +23,8 @@
- #ifndef CONTACT_ENTRY_H
- #define CONTACT_ENTRY_H
- 
--#include <libedataserver/e-source-group.h>
--#include <libedataserver/e-source-list.h>
--#include <libebook/e-contact.h>
- #include <gtk/gtk.h>
-+#include <libebook/libebook.h>
- 
- G_BEGIN_DECLS
- 
-@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void);
- 
- GtkWidget *e_contact_entry_new (void);
- 
--void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list);
--ESourceList *e_contact_entry_get_source_list (EContactEntry *entry);
-+void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry);
-+ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry);
- 
- void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
- int e_contact_entry_get_complete_length(EContactEntry *entry);
-diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c
-index 4e62e10..baef34f 100644
---- a/libgsm/phonemgr-utils.c
-+++ b/libgsm/phonemgr-utils.c
-@@ -27,7 +27,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <glib-object.h>
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <gnokii.h>
- 
- #include <bluetooth/bluetooth.h>
-diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c
-index 5d25622..38f4c2f 100644
---- a/src/e-phone-entry.c
-+++ b/src/e-phone-entry.c
-@@ -31,8 +31,7 @@
- 
- #include <gtk/gtk.h>
- #include <string.h>
--#include <libedataserver/e-source-list.h>
--#include <libedataserverui/e-client-utils.h>
-+#include <libedataserverui/libedataserverui.h>
- #include "e-phone-entry.h"
- 
- #define CONTACT_FORMAT "%s (%s)"
-@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object)
- }
- 
- static void
--add_sources (EContactEntry *entry)
--{
--	ESourceList *source_list;
--
--	if (e_client_utils_get_sources (&source_list,
--					E_CLIENT_SOURCE_TYPE_CONTACTS,
--					NULL)) {
--		e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry),
--						 source_list);
--		g_object_unref (source_list);
--	}
--}
--
--static void
- e_phone_entry_init (EPhoneEntry *entry)
- {
- 	EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 };
-+	ESourceRegistry *registry;
-+	GError *error = NULL;
-+
-+	/* XXX This call blocks while a D-Bus connection is made, possibly
-+	 *     requiring activation.  Might be better to create the registry
-+	 *     in main(), pass it to ui_init(), and have e_phone_entry_new()
-+	 *     take it as an argument.  Calling this from main() means if it
-+	 *     fails you can abort cleanly with a console error message. */
-+	registry = e_source_registry_new_sync (NULL, &error);
-+	if (registry == NULL) {
-+		g_error ("%s: %s", G_STRFUNC, error->message);
-+		g_assert_not_reached ();
-+	}
-+	e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry);
-+	g_object_unref (registry);
- 
--	add_sources (E_CONTACT_ENTRY (entry));
- 	e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields);
- 	e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL);
- 	g_signal_connect (G_OBJECT (entry), "contact_selected",
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-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD
deleted file mode 100644
index c2cb1dd1e..000000000
--- a/testing/gnome-power-manager/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169221 2012-10-18 19:26:31Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-power-manager
-pkgver=3.6.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')
-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=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-power-manager \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $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 f7e8c46ac..000000000
--- a/testing/gnome-power-manager/gnome-power-manager.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-python-desktop/PKGBUILD b/testing/gnome-python-desktop/PKGBUILD
deleted file mode 100644
index 2c0833284..000000000
--- a/testing/gnome-python-desktop/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id: PKGBUILD 168837 2012-10-16 11:53:40Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@soulfly.nl>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-
-pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
-pkgver=2.32.0
-pkgrel=11
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
-        gnome-python-desktop-2.32.0-metacity-build.patch)
-sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
-            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
-  make
-}
-
-package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome2-python')
-  pkgdesc="Python bindings for the GNOME desktop environment"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make install-pkgconfigDATA DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomedesktop() {
-  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
-  pkgdesc="Python bindings for gnome-desktop 2.x"
-  conflicts=('python-gnomedesktop<=2.32.0-10')
-  replaces=('python-gnomedesktop<=2.32.0-10')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomedesktop install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomekeyring() {
-  depends=('pygtk' 'libgnome-keyring')
-  pkgdesc="Python bindings for libgnome-keyring"
-  conflicts=('python-gnomekeyring<=2.32.0-10')
-  replaces=('python-gnomekeyring<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomekeyring install DESTDIR="${pkgdir}"
-}
-
-package_python2-gtop() {
-  depends=('pygtk' 'libgtop')
-  pkgdesc="Python bindings for libgtop"
-  conflicts=('python-gtop<=2.32.0-10')
-  replaces=('python-gtop<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gtop install DESTDIR="${pkgdir}"
-}
-
-package_python2-metacity() {
-  depends=('pygtk' 'metacity')
-  pkgdesc="Python bindings for metacity"
-  conflicts=('python-metacity<=2.32.0-10')
-  replaces=('python-metacity<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C metacity install DESTDIR="${pkgdir}"
-}
-
-package_python2-rsvg() {
-  depends=('pygtk' 'librsvg')
-  pkgdesc="Python bindings for librsvg"
-  conflicts=('python-rsvg<=2.32.0-10')
-  replaces=('python-rsvg<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C rsvg install DESTDIR="${pkgdir}"
-  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
-  install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
-package_python2-totem-plparser() {
-  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
-  pkgdesc="Python bindings for totem-plparser"
-  conflicts=('python-totem-plparser<=2.32.0-10')
-  replaces=('python-totem-plparser<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C totem install DESTDIR="${pkgdir}"
-  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
-  install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
-package_python2-wnck() {
-  depends=('pygtk' 'libwnck')
-  pkgdesc="Python bindings for libwnck"
-  conflicts=('python-wnck<=2.32.0-10')
-  replaces=('python-wnck<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C wnck install DESTDIR="${pkgdir}"
-}
diff --git a/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
deleted file mode 100644
index 5054dd2bd..000000000
--- a/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Daniel Drake <dsd@laptop.org>
-
-Fix build against metacity-2.34.2. The port to GSettings
-removed these constants from the codebase.
-
-Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
-===================================================================
---- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
-+++ gnome-python-desktop-2.32.0/metacity/metacity.defs
-@@ -120,32 +120,6 @@
-   )
- )
- 
--(define-enum FocusMode
--  (in-module "Meta")
--  (c-name "MetaFocusMode")
--;   (gtype-id "META_TYPE_FOCUS_MODE")
--  (values
--    '("click" "META_FOCUS_MODE_CLICK")
--    '("sloppy" "META_FOCUS_MODE_SLOPPY")
--    '("mouse" "META_FOCUS_MODE_MOUSE")
--  )
--)
--
--(define-enum ActionTitlebar
--  (in-module "Meta")
--  (c-name "MetaActionTitlebar")
--;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
--  (values
--    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
--    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
--    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
--    '("none" "META_ACTION_TITLEBAR_NONE")
--    '("lower" "META_ACTION_TITLEBAR_LOWER")
--    '("menu" "META_ACTION_TITLEBAR_MENU")
--    '("last" "META_ACTION_TITLEBAR_LAST")
--  )
--)
--
- (define-enum FrameType
-   (in-module "Meta")
-   (c-name "MetaFrameType")
diff --git a/testing/gnome-screensaver/PKGBUILD b/testing/gnome-screensaver/PKGBUILD
deleted file mode 100644
index 558151417..000000000
--- a/testing/gnome-screensaver/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169220 2012-10-18 19:26:26Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.6.1
-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' 'libsystemd')
-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=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
-            'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext --with-systemd
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../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 d1a42c6ce..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
-        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 453dae646..000000000
--- a/testing/gnome-screensaver/gnome-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so nullok
-auth        optional     pam_gnome_keyring.so
diff --git a/testing/gnome-screenshot/PKGBUILD b/testing/gnome-screenshot/PKGBUILD
deleted file mode 100644
index 0d380fc0c..000000000
--- a/testing/gnome-screenshot/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169219 2012-10-18 19:26:22Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-screenshot
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Take pictures of your screen"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3' 'libcanberra')
-makedepends=('intltool')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('96626b86d0ebaacf420b68ddd846d5185dc90a58e5d86843799c2071255b7636')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-screenshot/gnome-screenshot.install b/testing/gnome-screenshot/gnome-screenshot.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/testing/gnome-screenshot/gnome-screenshot.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-search-tool/PKGBUILD b/testing/gnome-search-tool/PKGBUILD
deleted file mode 100644
index ca530ec6e..000000000
--- a/testing/gnome-search-tool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169218 2012-10-18 19:26:17Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-search-tool
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Utility to search for files"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('gtk3' 'libsm')
-makedepends=('intltool' 'yelp-tools')
-install=$pkgname.install
-options=('!emptydirs')
-groups=('gnome-extra')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-search-tool/gnome-search-tool.install b/testing/gnome-search-tool/gnome-search-tool.install
deleted file mode 100644
index b631b6a89..000000000
--- a/testing/gnome-search-tool/gnome-search-tool.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.6.0) < 0 )) && gconfpkg --uninstall gnome-search-tool
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD
deleted file mode 100644
index 38e396045..000000000
--- a/testing/gnome-session/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 169217 2012-10-18 19:26:12Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-session
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
-         'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome'
-         'upower')
-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
-        gnome-session-3.3.1-llvmpipe.patch timeout.patch)
-sha256sums=('759c26230d8ac3f2d51344f5eaadce166819c4394acb733987e6d23fd42bddfb'
-            '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
-            '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Allow software rendering
-  patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch
-
-  # Increase timeout, for slow machines
-  patch -Np1 -i ../timeout.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile --enable-systemd
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch
deleted file mode 100644
index 40da1c9b7..000000000
--- a/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility
---- gnome-session-3.3.1/data/hardware-compatibility.jx	2011-10-21 10:35:39.000000000 -0400
-+++ gnome-session-3.3.1/data/hardware-compatibility	2011-11-03 17:53:17.156407217 -0400
-@@ -20,4 +20,4 @@
- 
- # Gallium has softpipe and llvmpipe
- -softpipe
---llvmpipe
-+#llvmpipe
diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/testing/gnome-session/gnome-session.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-session/timeout.patch b/testing/gnome-session/timeout.patch
deleted file mode 100644
index a26b0dcf5..000000000
--- a/testing/gnome-session/timeout.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r gnome-session-3.4.2/gnome-session/gsm-session-fill.c gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c
---- gnome-session-3.4.2/gnome-session/gsm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
-+++ gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
-@@ -36,7 +36,7 @@
- #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
- 
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
--#define GSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
-+#define GSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
- 
- typedef void (*GsmFillHandleProvider) (const char *provides,
-                                        const char *default_provider,
-diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c
---- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
-@@ -30,7 +30,7 @@
- #include <X11/Xatom.h>
- 
- /* Wait up to this long for a running check to finish */
--#define PROPERTY_CHANGE_TIMEOUT 5000
-+#define PROPERTY_CHANGE_TIMEOUT 12000
- 
- /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
- #define NO_ACCEL            0
diff --git a/testing/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/testing/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
deleted file mode 100644
index 293a419df..000000000
--- a/testing/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+++ /dev/null
@@ -1,1473 +0,0 @@
-From 79ead5309fe21e77cfe58adc6a9340953c2d52f4 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 21 Sep 2012 11:56:53 +0100
-Subject: [PATCH] power and media-keys: Use logind for suspending and
- rebooting the system
-
-Use the new logind features to suspend and resume but making sure we opt out
-of logind handling the sleep and power keys, and also inhibiting for lid close
-auto-suspend if there is an external monitor connected.
-
-Also use a delay inihibit for logind so that we can do actions on suspend like
-blanking the screen using the screensaver and also poking the screensaver on
-resume.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680689
----
- plugins/common/Makefile.am                  |   4 +-
- plugins/common/gsd-power-helper.c           | 203 --------
- plugins/common/gsd-power-helper.h           |  35 --
- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
- plugins/power/gsd-power-manager.c           | 699 +++++++++++++++++++---------
- 5 files changed, 595 insertions(+), 502 deletions(-)
- delete mode 100644 plugins/common/gsd-power-helper.c
- delete mode 100644 plugins/common/gsd-power-helper.h
-
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 7e50db4..b0e907c 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
- 	gsd-keygrab.c		\
- 	gsd-keygrab.h		\
- 	gsd-input-helper.c	\
--	gsd-input-helper.h	\
--	gsd-power-helper.c	\
--	gsd-power-helper.h
-+	gsd-input-helper.h
- 
- libcommon_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS)
-diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
-deleted file mode 100644
-index 27d0eda..0000000
---- a/plugins/common/gsd-power-helper.c
-+++ /dev/null
-@@ -1,203 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include "gsd-power-helper.h"
--
--#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
--#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
--#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
--
--#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
--#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
--#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
--
--#ifdef HAVE_SYSTEMD
--static void
--systemd_stop (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "PowerOff",
--                                g_variant_new ("(b)", FALSE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_suspend (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Suspend",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_hibernate (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Hibernate",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--#else /* HAVE_SYSTEMD */
--
--static void
--consolekit_stop_cb (GObject *source_object,
--                    GAsyncResult *res,
--                    gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't stop using ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--consolekit_stop (void)
--{
--        GError *error = NULL;
--        GDBusProxy *proxy;
--
--        /* power down the machine in a safe way */
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                               NULL,
--                                               CONSOLEKIT_DBUS_NAME,
--                                               CONSOLEKIT_DBUS_PATH_MANAGER,
--                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
--                                               NULL, &error);
--        if (proxy == NULL) {
--                g_warning ("cannot connect to ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--        g_dbus_proxy_call (proxy,
--                           "Stop",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           consolekit_stop_cb, NULL);
--        g_object_unref (proxy);
--}
--static void
--upower_sleep_cb (GObject *source_object,
--                 GAsyncResult *res,
--                 gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't sleep using UPower: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--upower_suspend (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Suspend",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--
--static void
--upower_hibernate (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Hibernate",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--#endif /* HAVE_SYSTEMD */
--
--void
--gsd_power_suspend (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_suspend ();
--#else
--	upower_suspend (upower_proxy);
--#endif
--}
--
--void
--gsd_power_poweroff (void)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_stop ();
--#else
--	consolekit_stop ();
--#endif
--}
--
--void
--gsd_power_hibernate (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_hibernate ();
--#else
--	upower_hibernate (upower_proxy);
--#endif
--}
-diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
-deleted file mode 100644
-index e3be14f..0000000
---- a/plugins/common/gsd-power-helper.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- */
--
--#ifndef __GSD_POWER_HELPER_H
--#define __GSD_POWER_HELPER_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--#include <gio/gio.h>
--
--void gsd_power_suspend   (GDBusProxy *upower_proxy);
--void gsd_power_hibernate (GDBusProxy *upower_proxy);
--void gsd_power_poweroff  (void);
--
--G_END_DECLS
--
--#endif /* __GSD_POWER_HELPER_H */
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 9c84d7f..a2f277e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
- 
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -51,7 +52,6 @@
- #include "shortcuts-list.h"
- #include "gsd-osd-window.h"
- #include "gsd-input-helper.h"
--#include "gsd-power-helper.h"
- #include "gsd-enums.h"
- 
- #include <canberra.h>
-@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
- #define KEY_CURRENT_INPUT_SOURCE "current"
- #define KEY_INPUT_SOURCES        "sources"
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
- 
-         /* Power stuff */
-         GSettings       *power_settings;
--        GDBusProxy      *upower_proxy;
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
- 
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
- }
- 
- static void
-+power_action_suspend (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
-+power_action_hibernate (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
- do_config_power_action (GsdMediaKeysManager *manager,
-                         const gchar *config_key)
- {
-@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                                            config_key);
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                power_action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown (manager);
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                power_action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
- 
-+        g_clear_object (&priv->logind_proxy);
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                 priv->power_keyboard_proxy = NULL;
-         }
- 
--        if (priv->upower_proxy) {
--                g_object_unref (priv->upower_proxy);
--                priv->upower_proxy = NULL;
--        }
--
-         if (priv->cancellable != NULL) {
-                 g_cancellable_cancel (priv->cancellable);
-                 g_object_unref (priv->cancellable);
-@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
- }
- 
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "GNOME handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
- 
- static void
-@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
- 
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
- 
-         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
- }
-@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
- }
- 
- static void
--upower_ready_cb (GObject             *source_object,
--                 GAsyncResult        *res,
--                 GsdMediaKeysManager *manager)
--{
--        GError *error = NULL;
--
--        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
--        if (manager->priv->upower_proxy == NULL) {
--                g_warning ("Failed to get proxy for upower: %s",
--                           error->message);
--                g_error_free (error);
--        }
--}
--
--static void
- power_screen_ready_cb (GObject             *source_object,
-                        GAsyncResult        *res,
-                        GsdMediaKeysManager *manager)
-@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
-                    manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
--
--        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--                                  G_DBUS_PROXY_FLAGS_NONE,
--                                  NULL,
--                                  "org.freedesktop.UPower",
--                                  "/org/freedesktop/UPower",
--                                  "org.freedesktop.UPower",
--                                  NULL,
--                                  (GAsyncReadyCallback) upower_ready_cb,
--                                  manager);
- }
- 
- GsdMediaKeysManager *
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 070cf32..18fcedf 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
-  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -32,6 +32,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
- 
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
-@@ -43,7 +44,6 @@
- #include "gnome-settings-session.h"
- #include "gsd-enums.h"
- #include "gsd-power-manager.h"
--#include "gsd-power-helper.h"
- 
- #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
- #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
-@@ -78,6 +78,10 @@
- #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
- #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-@@ -193,14 +197,20 @@ struct GsdPowerManagerPrivate
-         ca_context              *canberra_context;
-         ca_proplist             *critical_alert_loop_props;
-         guint32                  critical_alert_timeout_id;
--        GDBusProxy              *screensaver_proxy;
-         GDBusProxy              *session_proxy;
-         GDBusProxy              *session_presence_proxy;
-         GpmIdletime             *idletime;
-         GsdPowerIdleMode         current_idle_mode;
--        guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-         guint                    xscreensaver_watchdog_timer_id;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
-+        guint                    inhibit_lid_switch_timer_id;
- };
- 
- enum {
-@@ -217,8 +227,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
- static gchar    *engine_get_summary (GsdPowerManager *manager);
- static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
- static void      do_lid_closed_action (GsdPowerManager *manager);
--static void      lock_screensaver (GsdPowerManager *manager);
--static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
-+static void      uninhibit_lid_switch (GsdPowerManager *manager);
-+static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
- 
- G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
- 
-@@ -2048,6 +2058,57 @@ gnome_session_shutdown (void)
- }
- 
- static void
-+action_poweroff (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "PowerOff",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_hibernate (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
- do_power_action_type (GsdPowerManager *manager,
-                       GsdPowerActionType action_type)
- {
-@@ -2056,19 +2117,19 @@ do_power_action_type (GsdPowerManager *manager,
- 
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 /* this is only used on critically low battery where
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
--                gsd_power_poweroff ();
-+                action_poweroff (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -2140,85 +2201,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
-         return ret;
- }
- 
--static void
--do_lid_open_action (GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* play a sound, using sounds from the naming spec */
--        ca_context_play (manager->priv->canberra_context, 0,
--                         CA_PROP_EVENT_ID, "lid-open",
--                         /* TRANSLATORS: this is the sound description */
--                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
--                         NULL);
--
--        /* ensure we turn the panel back on after lid open */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after lid open: %s",
--                           error->message);
--                g_clear_error (&error);
--        }
--
--        /* only toggle keyboard if present and already toggled off */
--        if (manager->priv->upower_kdb_proxy != NULL &&
--            manager->priv->kbd_brightness_old != -1) {
--                ret = upower_kbd_toggle (manager, &error);
--                if (!ret) {
--                        g_warning ("failed to turn the kbd backlight on: %s",
--                                   error->message);
--                        g_error_free (error);
--                }
--        }
--
--        kill_lid_close_safety_timer (manager);
--}
--
- static gboolean
--is_on (GnomeRROutput *output)
-+inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
- {
--	GnomeRRCrtc *crtc;
--
--	crtc = gnome_rr_output_get_crtc (output);
--	if (!crtc)
--		return FALSE;
--	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
--}
--
--static gboolean
--non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
--{
--        GnomeRROutput **outputs;
--        int i;
--
--        outputs = gnome_rr_screen_list_outputs (screen);
--        for (i = 0; outputs[i] != NULL; i++) {
--                if (gnome_rr_output_is_laptop (outputs[i]))
--                        continue;
--
--                if (is_on (outputs[i]))
--                        return FALSE;
-+        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
-+            g_settings_get_boolean (manager->priv->settings,
-+                                    "lid-close-suspend-with-external-monitor")) {
-+                g_debug ("no external monitors for a while; uninhibiting lid close");
-+                uninhibit_lid_switch (manager);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                return G_SOURCE_REMOVE;
-         }
- 
--        return TRUE;
--}
--
--/* Timeout callback used to check conditions when the laptop's lid is closed but
-- * the machine is not suspended yet.  We try to suspend again, so that the laptop
-- * won't overheat if placed in a backpack.
-- */
--static gboolean
--lid_close_safety_timer_cb (GsdPowerManager *manager)
--{
--        manager->priv->lid_close_safety_timer_id = 0;
--
--        g_debug ("lid has been closed for a while; trying to suspend again");
--        do_lid_closed_action (manager);
--
--        return FALSE;
-+        g_debug ("external monitor still there; trying again later");
-+        return G_SOURCE_CONTINUE;
- }
- 
- /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2226,82 +2222,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
-  * again in the timeout handler to see if we can suspend then.
-  */
- static void
--setup_lid_close_safety_timer (GsdPowerManager *manager)
-+setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0)
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("lid close safety timer already set up");
-                 return;
-+        }
-+
-+        g_debug ("setting up lid close safety timer");
- 
--        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
--                                                                          (GSourceFunc) lid_close_safety_timer_cb,
-+        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
-+                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
-                                                                           manager);
--        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
-+        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
- }
- 
- static void
--kill_lid_close_safety_timer (GsdPowerManager *manager)
-+restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0) {
--                g_source_remove (manager->priv->lid_close_safety_timer_id);
--                manager->priv->lid_close_safety_timer_id = 0;
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("restarting lid close safety timer");
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                setup_inhibit_lid_switch_timer (manager);
-         }
- }
- 
- static void
--suspend_with_lid_closed (GsdPowerManager *manager)
-+do_lid_open_action (GsdPowerManager *manager)
- {
-         gboolean ret;
-         GError *error = NULL;
--        GsdPowerActionType action_type;
- 
--        /* maybe lock the screen if the lid is closed */
--        lock_screensaver (manager);
--
--        /* we have different settings depending on AC state */
--        if (up_client_get_on_battery (manager->priv->up_client)) {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-battery-action");
--        } else {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-ac-action");
--        }
--
--        /* check we won't melt when the lid is closed */
--        if (action_type != GSD_POWER_ACTION_SUSPEND &&
--            action_type != GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
--                        g_warning ("to prevent damage, now forcing suspend");
--                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
--                        return;
--                }
--        }
-+        /* play a sound, using sounds from the naming spec */
-+        ca_context_play (manager->priv->canberra_context, 0,
-+                         CA_PROP_EVENT_ID, "lid-open",
-+                         /* TRANSLATORS: this is the sound description */
-+                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
-+                         NULL);
- 
--        /* ensure we turn the panel back on after resume */
-+        /* ensure we turn the panel back on after lid open */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_OFF,
-+                                             GNOME_RR_DPMS_ON,
-                                              &error);
-         if (!ret) {
--                g_warning ("failed to turn the panel off after lid close: %s",
-+                g_warning ("failed to turn the panel on after lid open: %s",
-                            error->message);
--                g_error_free (error);
-+                g_clear_error (&error);
-         }
- 
--        /* only toggle keyboard if present and not already toggled */
--        if (manager->priv->upower_kdb_proxy &&
--            manager->priv->kbd_brightness_old == -1) {
-+        /* only toggle keyboard if present and already toggled off */
-+        if (manager->priv->upower_kdb_proxy != NULL &&
-+            manager->priv->kbd_brightness_old != -1) {
-                 ret = upower_kbd_toggle (manager, &error);
-                 if (!ret) {
--                        g_warning ("failed to turn the kbd backlight off: %s",
-+                        g_warning ("failed to turn the kbd backlight on: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--
--        do_power_action_type (manager, action_type);
- }
- 
- static void
- do_lid_closed_action (GsdPowerManager *manager)
- {
-+        gboolean ret;
-+        GError *error = NULL;
-+
-         /* play a sound, using sounds from the naming spec */
-         ca_context_play (manager->priv->canberra_context, 0,
-                          CA_PROP_EVENT_ID, "lid-close",
-@@ -2309,21 +2296,22 @@ do_lid_closed_action (GsdPowerManager *manager)
-                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
-                          NULL);
- 
-+        /* turn the panel off if the lid is closed (mainly for Dells...) */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_OFF,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel off after lid close: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
-         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
- 
--        /* perform policy action */
--        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
--            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
--                g_debug ("lid is closed; suspending or hibernating");
--                suspend_with_lid_closed (manager);
--        } else {
--                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
--                setup_lid_close_safety_timer (manager);
--        }
-+        restart_inhibit_lid_switch_timer (manager);
- }
- 
--
- static void
- up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
- {
-@@ -2343,6 +2331,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
-         if (manager->priv->lid_is_closed == tmp)
-                 return;
-         manager->priv->lid_is_closed = tmp;
-+        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
- 
-         /* fake a keypress */
-         if (tmp)
-@@ -3294,30 +3283,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
- }
- 
- static void
--sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
--                            GAsyncResult *res,
--                            gpointer user_data)
--{
--        GError *error = NULL;
--        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
--
--        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
--        if (manager->priv->screensaver_proxy == NULL) {
--                g_warning ("Could not connect to gnome-screensaver: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Finish the upower_notify_sleep_cb() call by locking the screen */
--        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
--        g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                           "Lock",
--                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                           NULL, NULL, NULL);
--}
--
--static void
- idle_dbus_signal_cb (GDBusProxy *proxy,
-                      const gchar *sender_name,
-                      const gchar *signal_name,
-@@ -3469,75 +3434,38 @@ out:
- }
- 
- static void
--lock_screensaver (GsdPowerManager *manager)
-+lock_screensaver (GsdPowerManager *manager,
-+                  GSourceFunc      done_cb)
- {
-         gboolean do_lock;
- 
-         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
-                                           "lock-enabled");
--        if (!do_lock)
-+        if (!do_lock && done_cb) {
-+                done_cb (manager);
-                 return;
--
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_debug ("doing gnome-screensaver lock");
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "Lock",
--                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                                   NULL, NULL, NULL);
--        } else {
--                /* connect to the screensaver first */
--                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                          NULL,
--                                          GS_DBUS_NAME,
--                                          GS_DBUS_PATH,
--                                          GS_DBUS_INTERFACE,
--                                          NULL,
--                                          sleep_cb_screensaver_proxy_ready_cb,
--                                          manager);
-         }
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        GsdPowerManager *manager)
--{
--        lock_screensaver (manager);
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
--        }
--
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
- 
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "Lock",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* Wait until gnome-shell shield animation is done
-+         *
-+         * FIXME: the shell should mark the lock as active
-+         * when the shield is down, then we could wait for
-+         * that. This would also fix the problem that we wait
-+         * needlessly when the shell has already locked the
-+         * screen because it is initiating the suspend.
-+         *
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
-+         */
-+        g_timeout_add (500, done_cb, manager);
- }
- 
- static void
-@@ -3696,6 +3624,287 @@ disable_builtin_screensaver (gpointer unused)
-         return TRUE;
- }
- 
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                g_debug ("no lid-switch inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing lid switch system inhibitor");
-+        close (manager->priv->inhibit_lid_switch_fd);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_lid_switch_taken = FALSE;
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "GNOME needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+}
-+
-+static gboolean
-+randr_output_is_on (GnomeRROutput *output)
-+{
-+	GnomeRRCrtc *crtc;
-+
-+	crtc = gnome_rr_output_get_crtc (output);
-+	if (!crtc)
-+		return FALSE;
-+	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
-+}
-+
-+static gboolean
-+external_monitor_is_connected (GnomeRRScreen *screen)
-+{
-+        GnomeRROutput **outputs;
-+        guint i;
-+
-+        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
-+                return TRUE;
-+
-+        /* see if we have more than one screen plugged in */
-+        outputs = gnome_rr_screen_list_outputs (screen);
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (randr_output_is_on (outputs[i]) &&
-+                    !gnome_rr_output_is_laptop (outputs[i]))
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+on_randr_event (GnomeRRScreen *screen, gpointer user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+
-+        /* when a second monitor is plugged in, we take the
-+         * handle-lid-switch inhibitor lock of logind to prevent
-+         * it from suspending.
-+         *
-+         * Uninhibiting is done in the inhibit_lid_switch_timer,
-+         * since we want to give users a few seconds when unplugging
-+         * and replugging an external monitor, not suspend right away.
-+         */
-+        if (external_monitor_is_connected (screen) &&
-+            !g_settings_get_boolean (manager->priv->settings,
-+                                     "lid-close-suspend-with-external-monitor")) {
-+                inhibit_lid_switch (manager);
-+                setup_inhibit_lid_switch_timer (manager);
-+        }
-+        else {
-+                restart_inhibit_lid_switch_timer (manager);
-+        }
-+}
-+
-+static gboolean
-+screen_lock_done_cb (gpointer data)
-+{
-+        GsdPowerManager *manager = data;
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        lock_screensaver (manager, screen_lock_done_cb);
-+}
-+
-+static void
-+handle_resume_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3705,6 +3914,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
- 
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return FALSE;
-+        }
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-         /* track the active session */
-         manager->priv->session = gnome_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3719,10 +3947,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
-         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-         manager->priv->up_client = up_client_new ();
--        g_signal_connect (manager->priv->up_client, "notify-sleep",
--                          G_CALLBACK (upower_notify_sleep_cb), manager);
--        g_signal_connect (manager->priv->up_client, "notify-resume",
--                          G_CALLBACK (upower_notify_resume_cb), manager);
-         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-         g_signal_connect (manager->priv->up_client, "device-added",
-                           G_CALLBACK (engine_device_added_cb), manager);
-@@ -3836,6 +4060,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
-         if (manager->priv->x11_screen == NULL)
-                 return FALSE;
-+        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
-+        /* set up initial state */
-+        on_randr_event (manager->priv->x11_screen, manager);
- 
-         /* ensure the default dpms timeouts are cleared */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3865,6 +4092,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
- 
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+        }
-+
-         if (manager->priv->bus_cancellable != NULL) {
-                 g_cancellable_cancel (manager->priv->bus_cancellable);
-                 g_object_unref (manager->priv->bus_cancellable);
-@@ -3876,8 +4108,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-                 manager->priv->introspection_data = NULL;
-         }
- 
--        kill_lid_close_safety_timer (manager);
--
-         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
- 
-         g_clear_object (&manager->priv->connection);
-@@ -3885,6 +4115,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-         g_clear_object (&manager->priv->settings);
-         g_clear_object (&manager->priv->settings_screensaver);
-         g_clear_object (&manager->priv->up_client);
-+
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        g_clear_object (&manager->priv->logind_proxy);
-         g_clear_object (&manager->priv->x11_screen);
- 
-         g_ptr_array_unref (manager->priv->devices_array);
-@@ -3918,6 +4161,8 @@ static void
- gsd_power_manager_init (GsdPowerManager *manager)
- {
-         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
- 
- static void
--- 
-1.7.12.2
-
diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD
deleted file mode 100644
index 4e972454a..000000000
--- a/testing/gnome-settings-daemon/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 169291 2012-10-18 21:41:48Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-settings-daemon
-pkgver=3.6.1
-pkgrel=2
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
-         'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus')
-makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        screensaver.patch
-        0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch)
-sha256sums=('1fe96e0709d7c618d90cc1bfcddc46eede3c2cdb305f5e7f4cb388d43dd5526a'
-            'd2c32fa0262e4d0e97fc07fb631ad2627b4f2ae273e2cb3028236d9725711880'
-            'f23db348593f58da755889928d7fa75817479d9ad5be67cc7a2f8cbc5db23632')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Disable X's built-in screensaver
-  patch -Np1 -i ../screensaver.patch
-
-  # logind key handling FS#31801, patch from Fedora
-  # rebased onto screensaver.patch
-  patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
-  aclocal
-  automake
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Plugins that aren't installed still have schema references
-  # and cause gsettings errors - remove the references we're not using
-  sed -i '/org\.gnome\.settings-daemon\.plugins\.updates/d' \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml"
-}
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 f7e8c46ac..000000000
--- a/testing/gnome-settings-daemon/gnome-settings-daemon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-settings-daemon/screensaver.patch b/testing/gnome-settings-daemon/screensaver.patch
deleted file mode 100644
index bbcfe3430..000000000
--- a/testing/gnome-settings-daemon/screensaver.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 17 Oct 2012 22:44:54 +0000
-Subject: power: Add a watchdog to keep X's builtin screen saver disabled
-
-X's builtin screen saver may activate DPMS. Since we want to activate
-DPMS ourselves according to our own policy we must make sure that X's
-screen saver remains disabled.
-
-This code is a copy of the original found in gs-watcher-x11.c from
-gnome-screensaver which stopped being used in GNOME 3.6.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686339
----
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 0e06495..070cf32 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <sys/wait.h>
- #include <glib/gi18n.h>
-+#include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
-@@ -80,6 +81,8 @@
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-+#define XSCREENSAVER_WATCHDOG_TIMEOUT                   120 /* seconds */
-+
- enum {
-         GSD_POWER_IDLETIME_NULL_ID,
-         GSD_POWER_IDLETIME_DIM_ID,
-@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate
-         GsdPowerIdleMode         current_idle_mode;
-         guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-+        guint                    xscreensaver_watchdog_timer_id;
- };
- 
- enum {
-@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session,
-         idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL);
- }
- 
-+/* This timer goes off every few minutes, whether the user is idle or not,
-+   to try and clean up anything that has gone wrong.
-+
-+   It calls disable_builtin_screensaver() so that if xset has been used,
-+   or some other program (like xlock) has messed with the XSetScreenSaver()
-+   settings, they will be set back to sensible values (if a server extension
-+   is in use, messing with xlock can cause the screensaver to never get a wakeup
-+   event, and could cause monitor power-saving to occur, and all manner of
-+   heinousness.)
-+
-+   This code was originally part of gnome-screensaver, see
-+   http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530
-+ */
-+static gboolean
-+disable_builtin_screensaver (gpointer unused)
-+{
-+        int current_server_timeout, current_server_interval;
-+        int current_prefer_blank,   current_allow_exp;
-+        int desired_server_timeout, desired_server_interval;
-+        int desired_prefer_blank,   desired_allow_exp;
-+
-+        XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                         &current_server_timeout,
-+                         &current_server_interval,
-+                         &current_prefer_blank,
-+                         &current_allow_exp);
-+
-+        desired_server_timeout  = current_server_timeout;
-+        desired_server_interval = current_server_interval;
-+        desired_prefer_blank    = current_prefer_blank;
-+        desired_allow_exp       = current_allow_exp;
-+
-+        desired_server_interval = 0;
-+
-+        /* I suspect (but am not sure) that DontAllowExposures might have
-+           something to do with powering off the monitor as well, at least
-+           on some systems that don't support XDPMS?  Who know... */
-+        desired_allow_exp = AllowExposures;
-+
-+        /* When we're not using an extension, set the server-side timeout to 0,
-+           so that the server never gets involved with screen blanking, and we
-+           do it all ourselves.  (However, when we *are* using an extension,
-+           we tell the server when to notify us, and rather than blanking the
-+           screen, the server will send us an X event telling us to blank.)
-+        */
-+        desired_server_timeout = 0;
-+
-+        if (desired_server_timeout     != current_server_timeout
-+            || desired_server_interval != current_server_interval
-+            || desired_prefer_blank    != current_prefer_blank
-+            || desired_allow_exp       != current_allow_exp) {
-+
-+                g_debug ("disabling server builtin screensaver:"
-+                         " (xset s %d %d; xset s %s; xset s %s)",
-+                         desired_server_timeout,
-+                         desired_server_interval,
-+                         (desired_prefer_blank ? "blank" : "noblank"),
-+                         (desired_allow_exp ? "expose" : "noexpose"));
-+
-+                XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                                 desired_server_timeout,
-+                                 desired_server_interval,
-+                                 desired_prefer_blank,
-+                                 desired_allow_exp);
-+
-+                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-+        }
-+
-+        return TRUE;
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         /* set the initial dim time that can adapt for the user */
-         refresh_idle_dim_settings (manager);
- 
-+        manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
-+                                                                               disable_builtin_screensaver,
-+                                                                               NULL);
-         gnome_settings_profile_end (NULL);
-         return TRUE;
- }
-@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- 
-         g_clear_object (&manager->priv->idletime);
-         g_clear_object (&manager->priv->status_icon);
-+
-+        if (manager->priv->xscreensaver_watchdog_timer_id > 0) {
-+                g_source_remove (manager->priv->xscreensaver_watchdog_timer_id);
-+                manager->priv->xscreensaver_watchdog_timer_id = 0;
-+        }
- }
- 
- static void
---
-cgit v0.9.0.2
diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD
deleted file mode 100644
index 9ad311911..000000000
--- a/testing/gnome-shell/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169215 2012-10-18 19:26:02Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip')
-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/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('566a9d902f85a89c23dc29f1789f859aa2c5a0de7dffa5235bf5a1885c76a3a7')
-
-build() {
-  cd $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 $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-shell/gnome-shell.install b/testing/gnome-shell/gnome-shell.install
deleted file mode 100644
index 27d70b19d..000000000
--- a/testing/gnome-shell/gnome-shell.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-system-log/PKGBUILD b/testing/gnome-system-log/PKGBUILD
deleted file mode 100644
index 2b4a08ea1..000000000
--- a/testing/gnome-system-log/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169214 2012-10-18 19:25:56Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-system-log
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="View your system logs"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3')
-makedepends=('intltool' 'itstool' 'docbook-xsl')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('46dea7cb8c63c26578bd0c854aa9143e86b094bc676564400bf4c57fc259369a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-system-log/gnome-system-log.install b/testing/gnome-system-log/gnome-system-log.install
deleted file mode 100644
index 847019792..000000000
--- a/testing/gnome-system-log/gnome-system-log.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD
deleted file mode 100644
index 345898ac4..000000000
--- a/testing/gnome-system-monitor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169213 2012-10-18 19:25:52Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-system-monitor
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd')
-makedepends=('itstool' 'docbook-xsl' '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=('5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $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 c25dff2d3..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD
deleted file mode 100644
index a7cb7d13f..000000000
--- a/testing/gnome-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169212 2012-10-18 19:25:48Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.6.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' 'itstool' 'docbook-xsl')
-options=('!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "$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 1d8510f06..000000000
--- a/testing/gnome-terminal/gnome-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-terminal
-
-post_install() {
-  gconfpkg --install $pkgname
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD
deleted file mode 100644
index 92a3bb730..000000000
--- a/testing/gnome-themes-standard/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169211 2012-10-18 19:25:43Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-themes-standard
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f56dd1f593b0a853041b54f9167aab0cb3689ced9cd8f8f4d777c3116bb4878a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-user-share/PKGBUILD b/testing/gnome-user-share/PKGBUILD
deleted file mode 100644
index d5dca3241..000000000
--- a/testing/gnome-user-share/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169208 2012-10-18 19:25:32Z jgc $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-user-share
-pkgver=3.0.4
-pkgrel=1
-pkgdesc="Easy to use user-level file sharing for GNOME."
-arch=('i686' 'x86_64')
-url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
-license=('GPL')
-depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
-makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl')
-options=('!emptydirs' '!libtool')
-install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-user-share \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-user-share/gnome-user-share.install b/testing/gnome-user-share/gnome-user-share.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/testing/gnome-user-share/gnome-user-share.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnucash/PKGBUILD b/testing/gnucash/PKGBUILD
deleted file mode 100644
index 23745c948..000000000
--- a/testing/gnucash/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165082 2012-08-10 05:02:38Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Mark Schneider <queueRAM@gmail.com>
-
-pkgname=gnucash
-pkgver=2.4.11
-pkgrel=1
-pkgdesc="A personal and small-business financial-accounting application"
-arch=('i686' 'x86_64')
-url="http://www.gnucash.org"
-license=("GPL")
-depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
-makedepends=('intltool')
-optdepends=('evince: for print preview'
-            'perl-finance-quote: for stock information lookups'
-            'perl-date-manip: for stock information lookups')
-options=('!libtool' '!makeflags' '!emptydirs')
-install=gnucash.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c157ad7ea0960c71966f5071acd9018580ece538')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
-    --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  cd src/doc/design
-  make DESTDIR="${pkgdir}" install-info
-
-  install -dm755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnucash "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnucash/gnucash.install b/testing/gnucash/gnucash.install
deleted file mode 100644
index d6a48c31b..000000000
--- a/testing/gnucash/gnucash.install
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=gnucash
-info_dir=usr/share/info
-info_files=(gnucash-design.info)
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnutls/PKGBUILD b/testing/gnutls/PKGBUILD
deleted file mode 100644
index e6517853f..000000000
--- a/testing/gnutls/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 165411 2012-08-18 10:15:13Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnutls
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/"
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
-makedepends=('valgrind' 'strace')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('db88d8fc44e44be4a0a14b24aa204bbf'
-         'c3fa5f3bda5ebe7f37cc997717bb8476')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--with-zlib \
-	--disable-static \
-	--disable-guile \
-	--disable-valgrind-tests
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -k check # passes all  || /bin/true
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}
diff --git a/testing/gnutls/gnutls.install b/testing/gnutls/gnutls.install
deleted file mode 100644
index e8c8e1798..000000000
--- a/testing/gnutls/gnutls.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.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/gobject-introspection/PKGBUILD b/testing/gobject-introspection/PKGBUILD
deleted file mode 100644
index f994ade98..000000000
--- a/testing/gobject-introspection/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169206 2012-10-18 19:25:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gobject-introspection
-pkgver=1.34.1.1
-pkgrel=1
-pkgdesc="Introspection system for GObject-based libraries"
-url="https://live.gnome.org/GObjectIntrospection"
-arch=('x86_64' 'i686')
-license=('LGPL' 'GPL')
-depends=('glib2' 'python2')
-makedepends=('cairo')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('85b9ac268d34311138f3c6bf646c07975eebfae6ae67d9239e1066a42c5d525b')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$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/gpm/PKGBUILD b/testing/gpm/PKGBUILD
deleted file mode 100644
index 3293e1ccc..000000000
--- a/testing/gpm/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 163459 2012-07-12 01:32:54Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpm
-pkgver=1.20.6
-pkgrel=10
-pkgdesc="A mouse server for the console and xterm"
-arch=('i686' 'x86_64')
-url="http://www.nico.schottelius.org/software/gpm/"
-license=('GPL')
-depends=('ncurses' 'bash')
-backup=('etc/conf.d/gpm')
-options=('!makeflags')
-install=gpm.install
-source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \
-        gpm gpm.conf.d gpm.sh gpm.service)
-sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c'
-          '19e1feb1493373512a77801699df012d186336ea'
-          '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86'
-          '88fe5ff10916c68a87abc8418a56eb0073f69fa9'
-          '20b92360f0ad38a2032fcae37bdbd01b31e43f77')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm"
-  install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm"
-  install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh"
-  install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service"
-
-# library fixes
-  cd "${pkgdir}/usr/lib/"
-  ln -s libgpm.so.2.* libgpm.so
-  chmod 755 "${pkgdir}"/usr/lib/libgpm.so.*
-}
diff --git a/testing/gpm/gpm b/testing/gpm/gpm
deleted file mode 100755
index 7b5213dd7..000000000
--- a/testing/gpm/gpm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-GPM_ARGS=
-[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/sbin/gpm)
-case "$1" in
-  start)
-    stat_busy "Starting GPM Daemon"
-    [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS}
-    PID=$(pidof -o %PPID /usr/sbin/gpm)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      add_daemon gpm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GPM Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gpm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/gpm/gpm.conf.d b/testing/gpm/gpm.conf.d
deleted file mode 100644
index ab43bb7eb..000000000
--- a/testing/gpm/gpm.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to gpm
-#
-GPM_ARGS="-m /dev/input/mice -t imps2"
diff --git a/testing/gpm/gpm.install b/testing/gpm/gpm.install
deleted file mode 100644
index 2a1519a6c..000000000
--- a/testing/gpm/gpm.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=/usr/share/info
-file=gpm.info.gz
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-}
diff --git a/testing/gpm/gpm.service b/testing/gpm/gpm.service
deleted file mode 100644
index 59e837d80..000000000
--- a/testing/gpm/gpm.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Virtual console mouse server
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/gpm/gpm.sh b/testing/gpm/gpm.sh
deleted file mode 100755
index af35a5f33..000000000
--- a/testing/gpm/gpm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-case $( /usr/bin/tty ) in
-    /dev/tty[0-9]*) [ -n "$(pgrep gpm)" ] && /usr/bin/disable-paste ;;
-esac
diff --git a/testing/gpsd/PKGBUILD b/testing/gpsd/PKGBUILD
deleted file mode 100644
index ba06a45e9..000000000
--- a/testing/gpsd/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 161928 2012-06-16 17:14:39Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Giacomo Rizzo <alt@free-os.it>
-
-pkgname=gpsd
-pkgver=3.6
-pkgrel=1
-pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
-url="http://catb.org/gpsd/"
-license=('BSD')
-depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
-optdepends=('php: generate a PHP status page for your GPS'
-            'php-gd: image support for the PHP status page'
-            'pygtk: GUI frontends')
-makedepends=('scons' 'docbook-xsl' 'chrpath')
-backup=('etc/conf.d/gpsd')
-options=('!libtool')
-install="${pkgname}.install"
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd' 'gpsd.conf.d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # fix python 2.7 path
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py')
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \
-    gpscat gpsfake gpsprof xgps xgpsspeed
-
-  scons prefix=/usr \
-    systemd=yes \
-    libQgpsmm=no \
-    PYTHONPATH=/usr/bin/python2
-  scons build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Fix man pages path (FS#21715)
-  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
-
-  export DESTDIR="${pkgdir}"
-  scons install
-
-  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
-
-  sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules
-
-  install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
-
-  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
-  install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
-
-  # GPSD needs RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so
-
-  install -D -m644 packaging/X11/xgps.desktop \
-    "${pkgdir}/usr/share/applications/xgps.desktop"
-  install -D -m644 packaging/X11/xgpsspeed.desktop \
-    "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
-  install -D -m644 packaging/X11/gpsd-logo.png \
-    "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
-
-  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
-
-  install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service"
-  install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket"
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-md5sums=('064a5ad75593f8c3ea3fe85010647832'
-         '6473da46f6bad52d38f88670f84cd92b'
-         '6602d04bb037bc500424f00f24f58837'
-         '3e963df3f9f7ef3572ecc648ae829315')
diff --git a/testing/gpsd/gpsd b/testing/gpsd/gpsd
deleted file mode 100755
index 2ca7efe26..000000000
--- a/testing/gpsd/gpsd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd
-
-NAME=gpsd
-DAEMON=/usr/sbin/gpsd
-PIDFILE=/run/gpsd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-
-case "$1" in
-   start)
-	stat_busy "Starting gpsd"
-	[ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /run/gpsd.sock ${GPSD_OPTIONS} ${DEVICES}
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon $NAME
-		stat_done
-	fi
-   ;;
-   stop)
-	stat_busy "Stopping $NAME"
-	[ ! -z "$PID" ]  && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-	    rm -f $PIDFILE &>/dev/null
-	    rm_daemon $NAME
-	    stat_done
-	fi
-   ;;
-
-   restart)
-	$0 stop
-	sleep 2
-	$0 start
-   ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/gpsd/gpsd.conf.d b/testing/gpsd/gpsd.conf.d
deleted file mode 100644
index 9fef72cb9..000000000
--- a/testing/gpsd/gpsd.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default settings for gpsd.
-START_DAEMON="true"
-GPSD_OPTIONS=""
-DEVICES=""
-USBAUTO="true"
diff --git a/testing/gpsd/gpsd.install b/testing/gpsd/gpsd.install
deleted file mode 100644
index 8f20cf484..000000000
--- a/testing/gpsd/gpsd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    update-desktop-database -q
-}
-
-post_remove() {
-    update-desktop-database -q
-}
diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD
deleted file mode 100644
index 1bcec6a13..000000000
--- a/testing/grep/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165463 2012-08-20 11:35:50Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=grep
-pkgver=2.14
-pkgrel=1
-pkgdesc="A string search utility"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/grep/grep.html"
-groups=('base')
-depends=('glibc' 'pcre' 'sh')
-makedepends=('texinfo')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('d4a3f03849d1e17ce56ab76aa5a24cab'
-         'b94fdcaa058b47a9a25099c26cd2e4c3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --without-included-regex
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/grep/grep-2.11-exclude-dir-crash.patch b/testing/grep/grep-2.11-exclude-dir-crash.patch
deleted file mode 100644
index 6b1731768..000000000
--- a/testing/grep/grep-2.11-exclude-dir-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Mon, 12 Mar 2012 09:28:01 +0100
-Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand
-
-* src/main.c (grepdir): Don't invoke excluded_file_name on NULL.
-* NEWS (Bug fixes): Mention it.
----
- NEWS       |    5 +++++
- src/main.c |    2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index d0a63d5..d4d70f5 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,11 @@ GNU grep NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Bug fixes
-+
-+   grep no longer segfaults with -r --exclude-dir and no file operand.
-+   I.e., ":|grep -r --exclude-dir=D PAT" would segfault.
-+
- 
- * Noteworthy changes in release 2.11 (2012-03-02) [stable]
- 
-diff --git a/src/main.c b/src/main.c
-index 2f6c761..f4f1235 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats)
-   struct stats const *ancestor;
-   char *name_space;
-   int status = 1;
--  if (excluded_directory_patterns
-+  if (dir && excluded_directory_patterns
-       && excluded_file_name (excluded_directory_patterns, dir))
-     return 1;
- 
--- 
-1.7.9.3
-
diff --git a/testing/grep/grep.install b/testing/grep/grep.install
deleted file mode 100644
index 885238ac3..000000000
--- a/testing/grep/grep.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-file=grep.info
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
diff --git a/testing/grilo-plugins/PKGBUILD b/testing/grilo-plugins/PKGBUILD
deleted file mode 100644
index 140b89001..000000000
--- a/testing/grilo-plugins/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169204 2012-10-18 19:25:16Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=grilo-plugins
-pkgver=0.2.2
-pkgrel=1
-pkgdesc="Plugins for Grilo"
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('grilo' 'sqlite' 'libgcrypt')
-makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing
-             json-glib)
-optdepends=('gupnp-av: uPnP plugin'
-            'libgdata: Youtube plugin'
-            'libquvi: Youtube plugin'
-            'sqlite: Podcasts plugin'
-            'gmime: Podcasts plugin'
-            'rest: Blip.tv plugin'
-            'libtracker-sparql: Tracker plugin'
-            'totem-plparser: Optical media plugin'
-            'libdmapsharing: DMAP sharing plugin'
-            'json-glib: TMDb plugin')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('54e65b734917df74ba5e53d92a3b2e69edd669625820fd0353c22e9b0f61e90d')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/grilo/PKGBUILD b/testing/grilo/PKGBUILD
deleted file mode 100644
index 61e5eb7fd..000000000
--- a/testing/grilo/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169205 2012-10-18 19:25:21Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=grilo
-pkgver=0.2.2
-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')
-optdepends=('grilo-plugins: Plugins for grilo')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e98d86e9c26dc444f43782e68f44a90da47f69da8a4ac313da9a3795fb72271f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug
-  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 b9adf6345..000000000
--- a/testing/gssdp/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169202 2012-10-18 19:25:09Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gssdp
-pkgver=0.12.2.1
-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://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gst-libav/PKGBUILD b/testing/gst-libav/PKGBUILD
deleted file mode 100644
index 9d07843ed..000000000
--- a/testing/gst-libav/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169201 2012-10-18 19:25:04Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-libav
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="Gstreamer libav Plugin"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('gst-plugins-base-libs' 'bzip2')
-makedepends=('yasm')
-options=(!libtool !emptydirs)
-provides=("gst-ffmpeg=$pkgver-pkgrel")
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('7c998468ffa57b5d1c2c76d6857dbc0c4ed87fd207ef71bf96aeaada6a1cfa89')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \
-    --with-package-name="GStreamer libav Plugin (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gst-plugins-bad/PKGBUILD b/testing/gst-plugins-bad/PKGBUILD
deleted file mode 100644
index 1326152c6..000000000
--- a/testing/gst-plugins-bad/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-bad
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Bad Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'faac' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus')
-makedepends=('gstreamer' 'schroedinger' 'gtk3' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e3cffcd258c4c722c880a52ebc9920d6b38aa4153bbc49d1b5a9893885d45f3')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Bad Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
-    --with-gtk=3.0
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gst-plugins-base/PKGBUILD b/testing/gst-plugins-base/PKGBUILD
deleted file mode 100644
index 27c9ccd41..000000000
--- a/testing/gst-plugins-base/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 153256 2012-03-12 15:48:30Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gst-plugins-base
-pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
-options=(!libtool !emptydirs)
-url="http://gstreamer.freedesktop.org/"
-source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('75466452e4267fff86e322bc52ed0c962c6c3785f802230fe898cb09984b8de0')
-
-build() {
-  cd $pkgbase-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
-}
-
-check() {
-  cd $pkgbase-$pkgver
-  # Testsuite fails on one test. Some refcount leak
-  #make check
-}
-
-package_gst-plugins-base-libs() {
-  pkgdesc="GStreamer Multimedia Framework Base Plugin libraries"
-  depends=('gstreamer' 'orc' 'libxv')
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gst-plugins-base() {
-  depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango')
-
-  cd $pkgbase-$pkgver
-  make -C gst-libs DESTDIR="${pkgdir}" install
-  make -C ext DESTDIR="${pkgdir}" install
-  make -C gst-libs DESTDIR="${pkgdir}" uninstall
-}
diff --git a/testing/gst-plugins-good/PKGBUILD b/testing/gst-plugins-good/PKGBUILD
deleted file mode 100644
index 8ae52cc53..000000000
--- a/testing/gst-plugins-good/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-good
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="GStreamer Multimedia Framework Good Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils')
-makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('30bc72d77d274289844e2138ca79c840')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gst-plugins-ugly/PKGBUILD b/testing/gst-plugins-ugly/PKGBUILD
deleted file mode 100644
index b585e6aaf..000000000
--- a/testing/gst-plugins-ugly/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169196 2012-10-18 19:24:44Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-ugly
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('378952a36e553f65fc1fcbcb0cc445304337e2e75503fb6b5f0ca2c05405e4f0')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./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
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gstreamer/PKGBUILD b/testing/gstreamer/PKGBUILD
deleted file mode 100644
index 474424f8a..000000000
--- a/testing/gstreamer/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 153251 2012-03-12 14:53:13Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gstreamer
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('libxml2' 'glib2')
-optdepends=('sh: feedback script')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('e0e5478bc81caa7e208b0863419bb98b2fbef281a7c806bea61bd70db8c9d3dc')
-
-build() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-    --with-package-name="GStreamer (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
-    --enable-gtk-doc --disable-static
-  make
-}
-
-check() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index fd4ee2dec..000000000
--- a/testing/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 163077 2012-07-06 16:17:18Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-ugly
-pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.19
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz
-        opencore-amr.patch)
-md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c'
-         'd8feb6c99bfaff8be6b2c48ea4e98e47')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  patch -Np0 -i "${srcdir}/opencore-amr.patch"
-  ./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
-}
-
-check() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make check
-}
-
-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' '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/gstreamer0.10-ugly/opencore-amr.patch b/testing/gstreamer0.10-ugly/opencore-amr.patch
deleted file mode 100644
index 0a350dc46..000000000
--- a/testing/gstreamer0.10-ugly/opencore-amr.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ext/amrnb/amrnbdec.h.orig	2012-03-12 16:49:14.417405139 +0000
-+++ ext/amrnb/amrnbdec.h	2012-03-12 16:49:35.393899419 +0000
-@@ -22,7 +22,7 @@
- 
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
--#include <interf_dec.h>
-+#include <opencore-amrnb/interf_dec.h>
- 
- G_BEGIN_DECLS
- 
---- ext/amrnb/amrnbenc.h.orig	2012-03-12 16:49:23.833996062 +0000
-+++ ext/amrnb/amrnbenc.h	2012-03-12 16:49:46.597141876 +0000
-@@ -21,7 +21,7 @@
- #define __GST_AMRNBENC_H__
- 
- #include <gst/gst.h>
--#include <interf_enc.h>
-+#include <opencore-amrnb/interf_enc.h>
- #include <gst/audio/gstaudioencoder.h>
- 
- G_BEGIN_DECLS
---- ext/amrwbdec/amrwbdec.h.orig	2012-03-12 16:47:48.658100992 +0000
-+++ ext/amrwbdec/amrwbdec.h	2012-03-12 16:48:12.177910733 +0000
-@@ -22,8 +22,8 @@
- 
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
--#include <dec_if.h>
--#include <if_rom.h>
-+#include <opencore-amrwb/dec_if.h>
-+#include <opencore-amrwb/if_rom.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/testing/gthumb/PKGBUILD b/testing/gthumb/PKGBUILD
deleted file mode 100644
index f35ef8f19..000000000
--- a/testing/gthumb/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 169530 2012-10-23 07:37:59Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=3.1.2
-pkgrel=1
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/gthumb"
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp')
-makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
-             'brasero' 'librsvg' 'libopenraw' 'liboauth')
-optdepends=('libopenraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'libsoup-gnome: web albums'
-            'liboauth: web albums')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e7f80b3ffa8a6e06b9f1bf0cfa869f772af4163b842a7f457c9dc68ff7e6f8f')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-libchamplain --enable-libopenraw
-  
-  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 $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gthumb/gthumb.install b/testing/gthumb/gthumb.install
deleted file mode 100644
index 9d4e7822f..000000000
--- a/testing/gthumb/gthumb.install
+++ /dev/null
@@ -1,19 +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 (( $(vercmp $2 2.90.1) < 0 )); then
-    gconfpkg --uninstall gthumb
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD
deleted file mode 100644
index 611780d9b..000000000
--- a/testing/gtk2/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 163760 2012-07-19 08:21:49Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.11
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
-             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
-options=('!libtool')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch)
-sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-build() {
-    cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/xid-collision-debug.patch"
-
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --with-xinput=yes
-
-    # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
-}
-
-package_gtk2() {
-    pkgdesc="GTK+ is a multi-platform toolkit (v2)"
-    install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
-    backup=(etc/gtk-2.0/gtkrc)
-    replaces=('gtk2-docs')
-
-    cd "$srcdir/gtk+-$pkgver"
-
-    make DESTDIR="$pkgdir" install
-    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-    echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
-    #split this out to use with gtk3 too
-    rm $pkgdir/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
-    pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2>=2.24.1-3')
-
-    cd "$srcdir/gtk+-$pkgver/gtk"
-
-    install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
-}
diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install
deleted file mode 100644
index a988c645b..000000000
--- a/testing/gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null
-  rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-}
diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/testing/gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD
deleted file mode 100644
index 16e10043b..000000000
--- a/testing/gtk3/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 169194 2012-10-18 19:24:35Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk')
-makedepends=('gobject-introspection')
-options=('!libtool')
-backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-        settings.ini wacom.patch)
-sha256sums=('fe6c89ae40145b077d7291105e81d4f876be01bf21ddfb9cba449f6be49d7996'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5')
-build() {
-    cd "gtk+-$pkgver"
-
-    # Partially revert BGO#673440 in order to fix BGO#674157
-    patch -Np1 -i ../wacom.patch
-
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-gtk2-dependency \
-        --disable-schemas-compile
-    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make
-}
-
-package() {
-    cd "gtk+-$pkgver"
-    make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
-}
diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install
deleted file mode 100644
index ca20d2865..000000000
--- a/testing/gtk3/gtk3.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    /usr/bin/gtk-query-immodules-3.0 --update-cache
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini
deleted file mode 100644
index 039000d38..000000000
--- a/testing/gtk3/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
diff --git a/testing/gtk3/wacom.patch b/testing/gtk3/wacom.patch
deleted file mode 100644
index 79ad84fc6..000000000
--- a/testing/gtk3/wacom.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c
---- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c	2012-05-02 14:45:04.000000000 +0200
-+++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c	2012-05-03 18:34:18.034807644 +0200
-@@ -331,6 +331,8 @@
-         input_source = GDK_SOURCE_ERASER;
-       else if (strstr (tmp_name, "cursor"))
-         input_source = GDK_SOURCE_CURSOR;
-+      else if (strstr (tmp_name, "finger"))
-+        input_source = GDK_SOURCE_TOUCHSCREEN;
-       else if (strstr (tmp_name, "wacom") ||
-                strstr (tmp_name, "pen"))
-         input_source = GDK_SOURCE_PEN;
diff --git a/testing/gtkglext/PKGBUILD b/testing/gtkglext/PKGBUILD
deleted file mode 100644
index c0f1b1005..000000000
--- a/testing/gtkglext/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169440 2012-10-21 08:31:13Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=gtkglext
-pkgver=1.2.0
-pkgrel=9
-pkgdesc="opengl extensions for gtk2"
-arch=('i686' 'x86_64')
-url="http://gtkglext.sourceforge.net/"
-license=('LGPL')
-depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
-makedepends=('mesa')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
-	'gtk2.20.patch')
-md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
-         'e5a87ec3f2d0e616c6f32f90c3f7237f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/gtk2.20.patch"
-  sed '/AC_PATH_XTRA/d' -i configure.in
-
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-              --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkglext/gtk2.20.patch b/testing/gtkglext/gtk2.20.patch
deleted file mode 100644
index 54b34c11e..000000000
--- a/testing/gtkglext/gtk2.20.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
---- gtkglext-1.2.0.orig/gtk/gtkglwidget.c	2004-02-20 11:38:36.000000000 +0200
-+++ gtkglext-1.2.0/gtk/gtkglwidget.c	2010-04-20 19:29:42.941917275 +0300
-@@ -127,7 +127,7 @@
-    * Synchronize OpenGL and window resizing request streams.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
-+  if (gtk_widget_get_realized (widget) && private->is_realized)
-     {
-       gldrawable = gdk_window_get_gl_drawable (widget->window);
-       gdk_gl_drawable_wait_gdk (gldrawable);
-@@ -154,7 +154,7 @@
-    * Remove OpenGL-capability from widget->window.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget))
-+  if (gtk_widget_get_realized (widget))
-     gdk_window_unset_gl_capability (widget->window);
- 
-   private->is_realized = FALSE;
-@@ -174,7 +174,7 @@
-    */
- 
-   toplevel = gtk_widget_get_toplevel (widget);
--  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
-+  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
-     {
-       GTK_GL_NOTE (MISC,
-         g_message (" - Install colormap to the top-level window."));
-@@ -194,7 +194,7 @@
-    * Set a background of "None" on window to avoid AIX X server crash.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget))
-+  if (gtk_widget_get_realized (widget))
-     {
-       GTK_GL_NOTE (MISC,
-         g_message (" - window->bg_pixmap = %p",
-@@ -250,8 +250,8 @@
-   GTK_GL_NOTE_FUNC ();
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
--  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
--  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
-+  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
-+  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
-   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
- 
-   /* 
-@@ -432,7 +432,7 @@
-   GTK_GL_NOTE_FUNC ();
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   gldrawable = gdk_window_get_gl_drawable (widget->window);
-   if (gldrawable == NULL)
-@@ -474,7 +474,7 @@
-   GLWidgetPrivate *private;
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
-   if (private == NULL)
-@@ -501,7 +501,7 @@
- gtk_widget_get_gl_window (GtkWidget *widget)
- {
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   return gdk_window_get_gl_window (widget->window);
- }
diff --git a/testing/gtkglextmm/PKGBUILD b/testing/gtkglextmm/PKGBUILD
deleted file mode 100644
index e3a098e14..000000000
--- a/testing/gtkglextmm/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 168486 2012-10-12 17:14:06Z andyrtr $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-pkgname=gtkglextmm
-pkgver=1.2.0
-pkgrel=9
-pkgdesc="Cpp C++ bindings for gtkglext"
-arch=('i686' 'x86_64')
-url="http://gtkglext.sourceforge.net/"
-depends=('gtkmm' 'gtkglext')
-makedepends=('mesa')
-options=('!libtool')
-license=('GPL')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
-        'gdkspanfunc.patch')
-md5sums=('27c05f4d45c5fd07b6fb0f044add3056'
-         'd7c8ea33c748a6857ee629c16b2d9bff')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # FS#24706
-  patch -Np1 -i "${srcdir}/gdkspanfunc.patch"
-
-  # automake 1.8 fix
-  sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4
-
-  ./configure --prefix=/usr \
-              --disable-gtkglext-test \
-              --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkglextmm/gdkspanfunc.patch b/testing/gtkglextmm/gdkspanfunc.patch
deleted file mode 100644
index ae5672a8c..000000000
--- a/testing/gtkglextmm/gdkspanfunc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/gtkglext/gtkmm/gl/widget.cc	2004-05-18 03:01:50.000000000 -0300
-+++ b/gtkglext/gtkmm/gl/widget.cc	2011-06-12 17:57:13.075541070 -0300
-@@ -17,9 +17,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gtk/gtkglwidget.h>
--
- #include "widget.h"
-+#include <gtk/gtkglwidget.h>
- 
- namespace Gtk
- {
diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD
deleted file mode 100644
index 53ca6a982..000000000
--- a/testing/gtkhtml4/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169193 2012-10-18 19:24:30Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtkhtml4
-_pkgbasename=gtkhtml
-pkgver=4.6.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=('129023d83d5e53f22c7b103ed8668204f78c23837955905315dc95b48618c29e')
-
-build() {
-    cd "$_pkgbasename-$pkgver"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gtkhtml4 \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "$_pkgbasename-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gtkmm3/PKGBUILD b/testing/gtkmm3/PKGBUILD
deleted file mode 100644
index b49d4d70a..000000000
--- a/testing/gtkmm3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169504 2012-10-22 14:39:10Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=gtkmm3
-_pkgbasename=gtkmm
-pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.6.0
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://www.gtkmm.org/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm3() {
-  pkgdesc="C++ bindings for gtk3"
-  depends=('gtk3' 'pangomm' 'atkmm')
-  cd "$_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 "$_pkgbasename-$pkgver"
-  make -C docs DESTDIR="$pkgdir" install
-}
diff --git a/testing/gtkpod/PKGBUILD b/testing/gtkpod/PKGBUILD
deleted file mode 100644
index 2317110ed..000000000
--- a/testing/gtkpod/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 164294 2012-07-29 23:15:49Z tomegun $
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=gtkpod
-pkgver=2.1.2
-pkgrel=2
-pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
-arch=('i686' 'x86_64')
-url="http://gtkpod.sourceforge.net"
-license=('GPL')
-depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk')
-makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
-optdepends=('libmp4v2: MP4/h264 support'
-            'vorbis-tools: OGG support'
-	    'libvorbis: OGG support'
-            'id3v2: mp3 conversion support'
-            'faad2: m4a conversion support')
-install=gtkpod.install
-options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz")
-md5sums=('88fef3f947cbb7ae6b714080733a3b6b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkpod/gtkpod.install b/testing/gtkpod/gtkpod.install
deleted file mode 100644
index c5d357a38..000000000
--- a/testing/gtkpod/gtkpod.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD
deleted file mode 100644
index b8ab610b1..000000000
--- a/testing/gtksourceview3/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169191 2012-10-18 19:24:22Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtksourceview3
-_pkgbasename=gtksourceview
-pkgver=3.6.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' 'gobject-introspection' 'glade')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('7d268618fbe8c2960300a305d38255294c9f497fcbc0e53a1da1bf9bda0d1c7a')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-glade-catalog
-  make
-}
-
-package() {
-  cd "$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD
deleted file mode 100644
index b83e71eea..000000000
--- a/testing/gucharmap/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169190 2012-10-18 19:24:18Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gucharmap
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('dconf' 'gtk3' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
-install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('778bbc61bedcb6c573800ccebc56d360d988a156727b5a8f8bac9787c1fe7fb4')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile  --enable-introspection
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install
deleted file mode 100644
index 0a9ddf4c2..000000000
--- a/testing/gucharmap/gucharmap.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gupnp/PKGBUILD b/testing/gupnp/PKGBUILD
deleted file mode 100644
index ea140a171..000000000
--- a/testing/gupnp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169189 2012-10-18 19:24:14Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gupnp
-pkgver=0.18.4
-pkgrel=1
-pkgdesc="An object-oriented UPNP framework"
-arch=('i686' 'x86_64')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('gssdp' 'util-linux')
-makedepends=('gobject-introspection' 'gtk-doc')
-optdepends=('python2: gupnp-binding-tool')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --with-context-manager=linux
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gutenprint/PKGBUILD b/testing/gutenprint/PKGBUILD
deleted file mode 100644
index 3924bec62..000000000
--- a/testing/gutenprint/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 161638 2012-06-12 18:43:43Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=gutenprint
-pkgver=5.2.8
-pkgrel=1
-pkgdesc="Top quality printer drivers for POSIX systems"
-arch=('i686' 'x86_64')
-license=('GPL')
-install=gutenprint.install
-depends=('readline' 'gnutls>=2.12.3') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it
-makedepends=('gimp>=2.6.11' 'gtk2>=2.24.4' 'cups>=1.4.6' 'foomatic-db-engine' 'ghostscript>=9.02')
-optdepends=('cups:		to use cups printer spooler(recommended)'
-            'foomatic-db-engine:	to use foomatic spooler'
-            'ghostscript:	adds postscript support for ijsgutenprint'
-            'gimp:		adds gutenprint plugin to gimp')
-source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2)
-url="http://gimp-print.sourceforge.net/"
-replaces=('gimp-print')
-options=('!libtool' '!emptydirs')
-md5sums=(5ed64c0f994245852da8e9fa6a137060'')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --enable-samples \
-	--enable-cups-ppds \
-	--enable-cups-ppds-at-top-level \
-	--disable-translated-cups-ppds \
-	--disable-globalized-cups-ppds \
-	--disable-static \
-	--disable-static-genppd
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-
diff --git a/testing/gutenprint/gutenprint.install b/testing/gutenprint/gutenprint.install
deleted file mode 100644
index 05e8bec38..000000000
--- a/testing/gutenprint/gutenprint.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
- echo ">>please run /usr/sbin/cups-genppdupdate"
- echo ">>and restart cups deamon"
-}
-
-post_upgrade() {
-   post_install
-}
-
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
deleted file mode 100644
index 98cc2c4f6..000000000
--- a/testing/gvfs/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 169188 2012-10-18 19:24:11Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.14.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)   
-sha256sums=('71ab8cf60070025d1aff9bee1f514fdb45682ffad01b6856cabab1bc3791bfb4')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/usr/share/bash-completion/completions
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret')
-  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'
-              'gtk3: Recent files support')
-  install=gvfs.install
-
-  cd "$pkgbase-$pkgver"
-  sed -e 's/^am__append_4/#am__append_4/' \
-      -e 's/^am__append_5/#am__append_5/' \
-      -i monitor/Makefile
-  make DESTDIR="$pkgdir" install
-
-  cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=$pkgver" 'smbclient')
-  install=gvfs-smb.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=$pkgver" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=$pkgver")
-  install=gvfs-module.install
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-}
diff --git a/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 da6a2ab6d..000000000
--- a/testing/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
deleted file mode 100644
index 3482d99e3..000000000
--- a/testing/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/gzip/PKGBUILD b/testing/gzip/PKGBUILD
deleted file mode 100644
index d92cbdeef..000000000
--- a/testing/gzip/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161985 2012-06-17 23:21:13Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=gzip
-pkgver=1.5
-pkgrel=1
-pkgdesc="GNU compression utility"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gzip/"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'bash')
-install=gzip.install
-source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig})
-md5sums=('2a431e169b6f62f7332ef6d47cc53bae'
-         '2de95937a3f65137acf9c55d4ad0447a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix=${pkgdir}/usr install
-}
diff --git a/testing/gzip/gzip.install b/testing/gzip/gzip.install
deleted file mode 100644
index 43218d98e..000000000
--- a/testing/gzip/gzip.install
+++ /dev/null
@@ -1,15 +0,0 @@
-infodir=usr/share/info
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  usr/bin/install-info $infodir/gzip.info.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  usr/bin/install-info --delete $infodir/gzip.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/harfbuzz/PKGBUILD b/testing/harfbuzz/PKGBUILD
deleted file mode 100644
index 3ceed5738..000000000
--- a/testing/harfbuzz/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=harfbuzz
-pkgver=0.9.4
-pkgrel=1
-pkgdesc="OpenType text shaping engine."
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-license=('MIT')
-depends=('icu' 'glib2' 'freetype2')
-makedepends=('icu' 'cairo' 'glib2' 'freetype2')
-optdepends=('cairo: hb-view program')
-options=(!libtool)
-source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING"
-}
diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD
deleted file mode 100644
index 5eb7da013..000000000
--- a/testing/haskell-http/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=HTTP
-pkgname=haskell-http
-pkgver=4000.2.4
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('5edcd9fd16a9cb72a140a29442d514b7')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-http/haskell-http.install b/testing/haskell-http/haskell-http.install
deleted file mode 100644
index fdebb1cb8..000000000
--- a/testing/haskell-http/haskell-http.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-http
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD
deleted file mode 100644
index f1fa7c286..000000000
--- a/testing/haskell-mtl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=mtl
-pkgname=haskell-mtl
-pkgver=2.1.2
-pkgrel=1
-pkgdesc="Monad transformer library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('943c110524d96126bfa0e61f7df1ebcd')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-mtl/haskell-mtl.install b/testing/haskell-mtl/haskell-mtl.install
deleted file mode 100644
index 9325811e8..000000000
--- a/testing/haskell-mtl/haskell-mtl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mtl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD
deleted file mode 100644
index 7f5d13fc1..000000000
--- a/testing/haskell-network/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=network
-pkgname=haskell-network
-pkgver=2.3.1.0
-pkgrel=1
-pkgdesc="Networking-related facilities"
-url="http://hackage.haskell.org/package/network"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d824db8fc068cab60fa178ab330a57a2')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-network/haskell-network.install b/testing/haskell-network/haskell-network.install
deleted file mode 100644
index a56c31d0a..000000000
--- a/testing/haskell-network/haskell-network.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-network
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD
deleted file mode 100644
index 9c7c1aafb..000000000
--- a/testing/haskell-parsec/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
-
-_hkgname=parsec
-pkgname=haskell-parsec
-pkgver=3.1.3
-pkgrel=1
-pkgdesc="Monadic parser combinators"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d72fc94b81153132c61125a1ec52a4a5')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-parsec/haskell-parsec.install b/testing/haskell-parsec/haskell-parsec.install
deleted file mode 100644
index dfa0701b9..000000000
--- a/testing/haskell-parsec/haskell-parsec.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-parsec
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-random/PKGBUILD b/testing/haskell-random/PKGBUILD
deleted file mode 100644
index 07cc5e2c2..000000000
--- a/testing/haskell-random/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=random
-pkgname=haskell-random
-pkgver=1.0.1.1
-pkgrel=3
-pkgdesc="A basic random number generation library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/testing/haskell-random/haskell-random.install b/testing/haskell-random/haskell-random.install
deleted file mode 100644
index b6d807e1a..000000000
--- a/testing/haskell-random/haskell-random.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-random
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD
deleted file mode 100644
index 5a23030d5..000000000
--- a/testing/haskell-text/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=text
-pkgname=haskell-text
-pkgver=0.11.2.3
-pkgrel=1
-pkgdesc="An efficient packed Unicode text type."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-text/haskell-text.install b/testing/haskell-text/haskell-text.install
deleted file mode 100644
index 620db3921..000000000
--- a/testing/haskell-text/haskell-text.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-text
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD
deleted file mode 100644
index c946fe40a..000000000
--- a/testing/haskell-transformers/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 167887 2012-10-03 15:19:41Z tdziedzic $
-
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Rémy Oudompheng <remy@archlinux.org>
-
-_hkgname=transformers
-pkgname=haskell-transformers
-pkgver=0.3.0.0
-pkgrel=2
-pkgdesc="Concrete functor and monad transformers"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
-install=${pkgname}.install
-md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-transformers/haskell-transformers.install b/testing/haskell-transformers/haskell-transformers.install
deleted file mode 100644
index eec2af6e1..000000000
--- a/testing/haskell-transformers/haskell-transformers.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-transformers
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD
deleted file mode 100644
index 30834b3c1..000000000
--- a/testing/haskell-zlib/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package originally generated by cabal2arch 0.7.6
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.3.3
-pkgrel=5
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'zlib' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    # ghc 7.6 includes bytestring 0.10
-    sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-zlib/haskell-zlib.install b/testing/haskell-zlib/haskell-zlib.install
deleted file mode 100644
index d387b7b65..000000000
--- a/testing/haskell-zlib/haskell-zlib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/hdparm/PKGBUILD b/testing/hdparm/PKGBUILD
deleted file mode 100644
index 062bd6008..000000000
--- a/testing/hdparm/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 167301 2012-09-30 19:26:10Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=hdparm
-pkgver=9.42
-pkgrel=1
-pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
-arch=(i686 x86_64)
-depends=('glibc')
-optdepends=('sh: required by idectl and ultrabayd')
-source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz
-        wiper.sh.2_6.max-ranges.patch)
-license=('BSD')
-url="http://sourceforge.net/projects/hdparm/"
-optdepends=('bash: for wiper.sh script')
-options=('emptydirs')
-md5sums=('0af5a38b212fe08f5afbe5e37f34b40b'
-         '74e368f384166a7710b447573cda120a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # Fix Range input/output error when wiping Intel G2 and OCZ drives
-  patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
-  
-  # build
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # install
-  mkdir -p ${pkgdir}/{usr,sbin}
-  make DESTDIR=${pkgdir} install
-  install -m755 contrib/idectl ${pkgdir}/sbin
-  install -m755 contrib/ultrabayd ${pkgdir}/sbin
-
-  install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
-  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh
-
-  #install license file
-  install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
-}
diff --git a/testing/hdparm/wiper.sh.2_6.max-ranges.patch b/testing/hdparm/wiper.sh.2_6.max-ranges.patch
deleted file mode 100644
index c55f7b149..000000000
--- a/testing/hdparm/wiper.sh.2_6.max-ranges.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- hdparm-9.28/wiper/wiper.sh.orig	2010-03-09 06:17:37.000000000 -0800
---- hdparm-9.28/wiper/wiper.sh	2010-05-15 03:08:02.182856971 -0700
-@@ -29,7 +29,7 @@
- function usage_error(){
- 	echo >&2
- 	echo "Linux tune-up (TRIM) utility for SATA SSDs"
--	echo "Usage:  $0 [--verbose] [--commit] <mount_point|block_device>" >&2
-+	echo "Usage:  $0 [--max-ranges <num>] [--verbose] [--commit] <mount_point|block_device>" >&2
- 	echo "   Eg:  $0 /dev/sda1" >&2
- 	echo >&2
- 	exit 1
-@@ -44,6 +44,7 @@
- 
- export verbose=0
- commit=""
-+max_ranges=-1
- destroy_me=""
- argc=$#
- arg=""
-@@ -51,6 +52,10 @@
- 		commit=yes
- 	elif [ "$1" = "--verbose" ]; then
- 		verbose=$((verbose + 1))
-+	elif [ "$1" = "--max-ranges" -a $argc -gt 1 ]; then
-+		max_ranges=$2
-+		argc=$((argc - 1))
-+		shift
- 	elif [ "$1" = "" ]; then
- 		usage_error
- 	else
-@@ -499,6 +550,18 @@
- 	fi
- fi
- 
-+## Different SSD's have a different maximum number of ranges they'll accept
-+## in a single TRIM command.
-+if [ $max_ranges -le 0 ] ; then
-+	model=`$HDPARM -I $rawdev | $GAWK '/Model Number/ { print $NF }'`
-+	case "$model" in
-+		SSDSA[12]*)  max_ranges=512 ;;	# Intel X18-M/X25-M
-+		OCZ-VERTEX2) max_ranges=64 ;;	# OCZ Vertex2
-+		*)           max_ranges=65535
-+	esac
-+fi
-+[ $verbose -gt 0 ] && echo "max-ranges = $max_ranges"
-+
- ## All ready.  Now let the user know exactly what we intend to do:
- ##
- mountstatus="$fstype non-mounted"
-@@ -608,7 +671,7 @@
- 		nsectors += count;
- 		while (count > 0) {
- 			this_count  = (count > 65535) ? 65535 : count
--			printf "%u:%u ", lba, this_count
-+			printf "%u:%u \n", lba, this_count
- 			if (verbose > 1)
- 				printf "%u:%u ", lba, this_count > "/dev/stderr"
- 			lba        += this_count
-@@ -695,6 +758,22 @@
- 	-v verbose="$verbose"			\
- 	-v xfs_blksects="$xfs_blksects"		\
- 	-v xfs_agoffsets="$xfs_agoffsets"	\
--	"$GAWKPROG" | $TRIM
-+	"$GAWKPROG" | (
-+		i=0
-+		while read range ; do
-+			ranges=$ranges" "$range
-+			((i++))
-+			if [ $i -ge $max_ranges ] ; then
-+				[ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"         
-+				echo $ranges | $TRIM
-+				ranges=""
-+				i=0
-+			fi
-+		done
-+		if [ $i -gt 0 ] ; then
-+			[ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
-+ 			echo $ranges | $TRIM
-+		fi
-+	)
- 
- do_cleanup $?
-
- 	  	 
diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD
deleted file mode 100644
index c76a7bfeb..000000000
--- a/testing/hugin/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169638 2012-10-25 01:35:06Z eric $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=hugin
-pkgver=2011.4.0
-pkgrel=7
-pkgdesc="A frontend to the panorama-tools"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
-license=('GPL')
-depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
-         'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
-makedepends=('zip' 'cmake' 'boost' 'tclap' 'mesa')
-install=hugin.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        gcc47.patch)
-sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b'
-          'aa0fc9425bd7a4b5e270412f4ca72258fac77298')
-
-build() {
-  cd "${srcdir}"
-  patch -Np0 -i gcc47.patch
-  mkdir build
-  cd build
-  export CXXFLAGS+=" -fpermissive" 
-  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/gcc47.patch b/testing/hugin/gcc47.patch
deleted file mode 100644
index 3814b871c..000000000
--- a/testing/hugin/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp
---- hugin-2011.4.0.orig/src/celeste/Utilities.cpp	2012-07-08 15:18:16.864454043 +0000
-+++ hugin-2011.4.0/src/celeste/Utilities.cpp	2012-07-08 15:18:20.341089422 +0000
-@@ -27,6 +27,7 @@
- 
- #include <math.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include "Utilities.h"
- 
- using namespace std; 
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/hwloc/PKGBUILD b/testing/hwloc/PKGBUILD
deleted file mode 100644
index 79fd2f67d..000000000
--- a/testing/hwloc/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167124 2012-09-25 18:41:34Z stephane $
-# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
-# Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
-
-pkgname=hwloc
-pkgver=1.5
-pkgrel=1
-pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
-arch=('i686' 'x86_64')
-url="http://www.open-mpi.org/projects/hwloc/"
-license=('BSD')
-depends=('sh' 'pciutils' 'cairo' 'libxml2')
-makedepends=('pkg-config')
-options=('!libtool' '!docs')
-source=(http://www.open-mpi.org/software/hwloc/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('b2e60bd40cfc6ca79dde68b19a83e8a4719d6b14')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure --prefix=/usr
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-
-   install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/ibus/PKGBUILD b/testing/ibus/PKGBUILD
deleted file mode 100644
index a0aeebf1a..000000000
--- a/testing/ibus/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169430 2012-10-21 04:52:25Z eric $
-# Contributor: Rainy <rainylau(at)gmail(dot)com>
-# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=ibus
-pkgver=1.4.99.20121006
-pkgrel=1
-pkgdesc="Next Generation Input Bus for Linux"
-arch=('i686' 'x86_64')
-url="http://ibus.googlecode.com"
-license=('LGPL')
-makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool')
-depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject')
-options=('!libtool')
-install=ibus.install
-source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('e324382caa8dde8e4ea9c3d60a6ec5c96a313a86')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  export PYTHON=python2
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus \
-    --sysconfdir=/etc \
-    --disable-gconf \
-    --enable-dconf \
-    --disable-memconf \
-    --enable-ui
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/ibus/ibus.install b/testing/ibus/ibus.install
deleted file mode 100644
index e4e446693..000000000
--- a/testing/ibus/ibus.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-    gtk-query-immodules-3.0 --update-cache 
-
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-    gtk-query-immodules-3.0 --update-cache 
-
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/ilmbase/PKGBUILD b/testing/ilmbase/PKGBUILD
deleted file mode 100644
index fe1618f48..000000000
--- a/testing/ilmbase/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=ilmbase
-pkgver=1.0.3
-pkgrel=1
-depends=('gcc-libs')
-pkgdesc="Base libraries from ILM for OpenEXR"
-arch=(i686 x86_64)
-url="http://www.openexr.com"
-license=('custom')
-options=('!libtool')
-source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz 
-        ilmbase-IexMath.patch)
-md5sums=('d99962ec7e2bfac0647aaabf6b91d5de'
-         '9c8efaf15f60bccf79749ec879657962')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  patch -p0 -i "${srcdir}/ilmbase-IexMath.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  # one of the tests fails randomly for an unknown reason
-  make check || true
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/testing/ilmbase/ilmbase-IexMath.patch b/testing/ilmbase/ilmbase-IexMath.patch
deleted file mode 100644
index 546034966..000000000
--- a/testing/ilmbase/ilmbase-IexMath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
-+++ IexMath/IexMathFpu.cpp	2012-10-04 15:30:47.000000000 +0200
-@@ -27,8 +27,7 @@
- #endif
- 
- 
--#ifdef HAVE_UCONTEXT_H
--
-+#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
- 
- #include <ucontext.h>
- #include <signal.h>
diff --git a/testing/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD
deleted file mode 100644
index 985a18f01..000000000
--- a/testing/imagemagick/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 169640 2012-10-25 01:35:11Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.0.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
-source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-        perlmagick.rpath.patch)
-sha1sums=('47926535dd68b38f5ae8a01e470cebf671018831'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
-
-build() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf --force --install
-  patch -p0 -i ../perlmagick.rpath.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
-    --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
-    --without-gvc --without-djvu --without-autotrace --without-webp \
-    --without-jbig --without-fpx --without-dps --without-fftw
-  make
-}
-
-check() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-#  make check
-}
-
-package_imagemagick() {
-  pkgdesc="An image viewing/manipulation program"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr')
-  optdepends=('ghostscript: for Ghostscript support' 
-              'openexr: for OpenEXR support' 
-              'libwmf: for WMF support' 
-              'librsvg: for SVG support' 
-              'libxml2: for XML support' 
-              'jasper: for JPEG-2000 support' 
-              'libpng: for PNG support')
-  backup=('etc/ImageMagick/coder.xml'
-          'etc/ImageMagick/colors.xml'
-          'etc/ImageMagick/delegates.xml'
-          'etc/ImageMagick/log.xml'
-          'etc/ImageMagick/magic.xml'
-          'etc/ImageMagick/mime.xml'
-          'etc/ImageMagick/policy.xml'
-          'etc/ImageMagick/quantization-table.xml'
-          'etc/ImageMagick/thresholds.xml'
-          'etc/ImageMagick/type.xml'
-          'etc/ImageMagick/type-dejavu.xml'
-          'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml')
-  options=('!docs' 'libtool' '!emptydirs')
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install
-  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
-  find "${pkgdir}" -name '*.bs' -delete
-  rm -f "${pkgdir}"/usr/lib/*.la
-}
-
-package_imagemagick-doc() {
-  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install-data-html
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}
diff --git a/testing/imagemagick/perlmagick.rpath.patch b/testing/imagemagick/perlmagick.rpath.patch
deleted file mode 100644
index 958c0f2ee..000000000
--- a/testing/imagemagick/perlmagick.rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD
deleted file mode 100644
index 583c24148..000000000
--- a/testing/inetutils/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 165845 2012-08-31 23:00:09Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=inetutils
-pkgver=1.9.1
-pkgrel=4
-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')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
-        '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 rlogin.xinetd rsh.xinetd \
-        ftpd.service dnsdomainname)
-sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
-          'ff0aad9946a38915580b094dadf67e790e8a2f87'
-          '84dc802b5e57b5e04c847572225a3b9612017155'
-          '68a590083b45997dfdb80e666b2de762f494ba74'
-          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
-          '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
-          '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'fb607dafe177f074e14891dd887ef9e9ab67a875'
-          'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
-  ./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-rcp --enable-hostname \
-    --disable-rexec --disable-rexecd \
-    --disable-tftp --disable-tftpd \
-    --disable-ping --disable-ping6 \
-    --disable-logger --disable-syslogd \
-    --disable-inetd --disable-whois \
-    --disable-uucpd --disable-ifconfig --disable-traceroute
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-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}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
-  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}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
-  install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
-  install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service"
-}
diff --git a/testing/inetutils/dnsdomainname b/testing/inetutils/dnsdomainname
deleted file mode 100644
index a1b8a8c31..000000000
--- a/testing/inetutils/dnsdomainname
+++ /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/ftpd.service b/testing/inetutils/ftpd.service
deleted file mode 100644
index 5708bdfd1..000000000
--- a/testing/inetutils/ftpd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=FTPD Daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/ftpd -D
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
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/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/inkscape/PKGBUILD b/testing/inkscape/PKGBUILD
deleted file mode 100644
index 762134903..000000000
--- a/testing/inkscape/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 169641 2012-10-25 01:35:14Z eric $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.3.1
-pkgrel=7
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
-         'python2' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('pstoedit: latex formulas'
-            'texlive-core: latex formulas'
-            'python2-numpy: some extensions'
-            'python2-lxml: some extensions and filters'
-            'pyxml: some extensions'
-            'uniconvertor: reading/writing to some proprietary formats')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'poppler20.patch'
-        'libpng15.patch')
-sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
-          '7316c2903c157781838cce289a709d100dc40fec'
-          'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
-	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
-	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
-	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
-	sed -i 's|"python"|"python2"|g' src/main.cpp
-
-	patch -p1 -i ../poppler20.patch
-	patch -p1 -i ../libpng15.patch
-
-	./configure \
-		--prefix=/usr \
-		--with-python \
-		--with-perl \
-		--enable-lcms \
-		--enable-poppler-cairo \
-		--disable-dependency-tracking \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/inkscape/install b/testing/inkscape/install
deleted file mode 100644
index 6e803bf1d..000000000
--- a/testing/inkscape/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-	post_install
-}
-
-
-post_remove() {
-	post_install
-}
diff --git a/testing/inkscape/libpng15.patch b/testing/inkscape/libpng15.patch
deleted file mode 100644
index e24913ed6..000000000
--- a/testing/inkscape/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
-+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1443,7 +1443,7 @@
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
---- inkscape-0.48.1/src/helper/png-write.cpp
-+++ inkscape-0.48.1-mod//src/helper/png-write.cpp
-@@ -165,7 +165,7 @@
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         /* If we get here, we had a problem reading the file */
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
---- inkscape-0.48.1/src/sp-image.cpp
-+++ inkscape-0.48.1-mod//src/sp-image.cpp
-@@ -386,9 +386,13 @@
- 
- #if defined(PNG_iCCP_SUPPORTED)
-                 {
--                    char* name = 0;
-+                    png_charp name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+                    png_charp profile = 0;
-+#else
-+                    png_bytep profile = 0;
-+#endif
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/testing/inkscape/poppler20.patch b/testing/inkscape/poppler20.patch
deleted file mode 100644
index ecb74603f..000000000
--- a/testing/inkscape/poppler20.patch
+++ /dev/null
@@ -1,642 +0,0 @@
-diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp
---- old/src/extension/internal/pdfinput/pdf-parser.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/pdf-parser.cpp	2012-05-13 21:07:11.334781215 +0200
-@@ -367,14 +367,14 @@
-     for (i = 0; i < obj->arrayGetLength(); ++i) {
-       obj->arrayGet(i, &obj2);
-       if (!obj2.isStream()) {
--	error(-1, const_cast<char*>("Weird page contents"));
-+	error(errInternal, -1, const_cast<char*>("Weird page contents"));
- 	obj2.free();
- 	return;
-       }
-       obj2.free();
-     }
-   } else if (!obj->isStream()) {
--    error(-1, const_cast<char*>("Weird page contents"));
-+    error(errInternal, -1, const_cast<char*>("Weird page contents"));
-     return;
-   }
-   parser = new Parser(xref, new Lexer(xref, obj), gFalse);
-@@ -419,7 +419,7 @@
- 
-     // too many arguments - something is wrong
-     } else {
--      error(getPos(), const_cast<char*>("Too many args in content stream"));
-+      error(errInternal, getPos(), const_cast<char*>("Too many args in content stream"));
-       if (printCommands) {
- 	printf("throwing away arg: ");
- 	obj.print(stdout);
-@@ -436,7 +436,7 @@
- 
-   // args at end with no command
-   if (numArgs > 0) {
--    error(getPos(), const_cast<char*>("Leftover args in content stream"));
-+    error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream"));
-     if (printCommands) {
-       printf("%d leftovers:", numArgs);
-       for (i = 0; i < numArgs; ++i) {
-@@ -502,7 +502,7 @@
-   name = cmd->getCmd();
-   if (!(op = findOp(name))) {
-     if (ignoreUndef == 0)
--      error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-+      error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-     return;
-   }
- 
-@@ -510,26 +510,26 @@
-   argPtr = args;
-   if (op->numArgs >= 0) {
-     if (numArgs < op->numArgs) {
--      error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-+      error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-       return;
-     }
-     if (numArgs > op->numArgs) {
- #if 0
--      error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
-+      error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
- #endif
-       argPtr += numArgs - op->numArgs;
-       numArgs = op->numArgs;
-     }
-   } else {
-     if (numArgs > -op->numArgs) {
--      error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
-+      error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
- 	    numArgs, name);
-       return;
-     }
-   }
-   for (i = 0; i < numArgs; ++i) {
-     if (!checkArg(&argPtr[i], op->tchk[i])) {
--      error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
-+      error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
- 	    i, name, argPtr[i].getTypeName());
-       return;
-     }
-@@ -690,7 +690,7 @@
-     return;
-   }
-   if (!obj1.isDict()) {
--    error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-+    error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-     obj1.free();
-     return;
-   }
-@@ -705,7 +705,7 @@
-     if (state->parseBlendMode(&obj2, &mode)) {
-       state->setBlendMode(mode);
-     } else {
--      error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -764,7 +764,7 @@
-       state->setTransfer(funcs);
-     }
-   } else if (!obj2.isNull()) {
--    error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-+    error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-   }
-   obj2.free();
- 
-@@ -784,7 +784,7 @@
- 	funcs[0] = Function::parse(&obj3);
- 	if (funcs[0]->getInputSize() != 1 ||
- 	    funcs[0]->getOutputSize() != 1) {
--	  error(getPos(),
-+	  error(errInternal, getPos(),
- 		const_cast<char*>("Invalid transfer function in soft mask in ExtGState"));
- 	  delete funcs[0];
- 	  funcs[0] = NULL;
-@@ -809,11 +809,7 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
--#else
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
--#endif
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -840,15 +836,15 @@
- 	    delete funcs[0];
- 	  }
- 	} else {
--	  error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	  error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
- 	}
- 	obj4.free();
-       } else {
--	error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-       }
-       obj3.free();
-     } else if (!obj2.isNull()) {
--      error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -876,7 +872,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -884,7 +880,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &obj1);
-   if (!obj1.isArray()) {
-     obj1.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -1012,19 +1008,11 @@
- 
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setFillColorSpace(colorSpace);
-@@ -1032,7 +1020,7 @@
-     state->setFillColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (fill)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)"));
-   }
- }
- 
-@@ -1043,19 +1031,11 @@
- 
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setStrokeColorSpace(colorSpace);
-@@ -1063,7 +1043,7 @@
-     state->setStrokeColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (stroke)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)"));
-   }
- }
- 
-@@ -1072,7 +1052,7 @@
-   int i;
- 
-   if (numArgs != state->getFillColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-     return;
-   }
-   state->setFillPattern(NULL);
-@@ -1088,7 +1068,7 @@
-   int i;
- 
-   if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-     return;
-   }
-   state->setStrokePattern(NULL);
-@@ -1109,7 +1089,7 @@
-       if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1120,23 +1100,15 @@
-       state->setFillColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setFillPattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getFillColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-       return;
-     }
-     state->setFillPattern(NULL);
-@@ -1161,7 +1133,7 @@
- 	       ->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1172,23 +1144,15 @@
-       state->setStrokeColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setStrokePattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-       return;
-     }
-     state->setStrokePattern(NULL);
-@@ -1212,7 +1176,7 @@
- 
- void PdfParser::opLineTo(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in lineto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in lineto"));
-     return;
-   }
-   state->lineTo(args[0].getNum(), args[1].getNum());
-@@ -1222,7 +1186,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1238,7 +1202,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto1"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto1"));
-     return;
-   }
-   x1 = state->getCurX();
-@@ -1254,7 +1218,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto2"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto2"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1282,7 +1246,7 @@
- 
- void PdfParser::opClosePath(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in closepath"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in closepath"));
-     return;
-   }
-   state->closePath();
-@@ -1298,7 +1262,7 @@
- 
- void PdfParser::opStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1314,7 +1278,7 @@
- 
- void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke"));
-     return;
-   }
-   state->closePath();
-@@ -1331,7 +1295,7 @@
- 
- void PdfParser::opFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1347,7 +1311,7 @@
- 
- void PdfParser::opEOFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1363,7 +1327,7 @@
- 
- void PdfParser::opFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1376,7 +1340,7 @@
- 
- void PdfParser::opCloseFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1388,7 +1352,7 @@
- 
- void PdfParser::opEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1399,7 +1363,7 @@
- 
- void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1440,7 +1404,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1459,7 +1423,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1579,15 +1543,9 @@
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-     return;
-   }
--#else
--  if (!(shading = res->lookupShading(args[0].getName()))) {
--    return;
--  }
--#endif
- 
-   // save current graphics state
-   if (shading->getType() != 2 && shading->getType() != 3) {
-@@ -2156,7 +2114,7 @@
- 
- void PdfParser::opShowText(Object args[], int numArgs) {
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2170,7 +2128,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2188,7 +2146,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/set/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/set/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2211,7 +2169,7 @@
-   int i;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show/space"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show/space"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2236,7 +2194,7 @@
-     } else if (obj.isString()) {
-       doShowText(obj.getString());
-     } else {
--      error(getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-+      error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-     }
-     obj.free();
-   }
-@@ -2334,7 +2292,7 @@
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
--	  error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
-+	  error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
- 	}
- 	//out->endType3Char(state);
- 	if (resDict) {
-@@ -2410,7 +2368,7 @@
-     return;
-   }
-   if (!obj1.isStream()) {
--    error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-+    error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-     obj1.free();
-     return;
-   }
-@@ -2426,9 +2384,9 @@
- /*    out->psXObject(obj1.getStream(),
-     		   obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
-   } else if (obj2.isName()) {
--    error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-+    error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-   } else {
--    error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-+    error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-   }
-   obj2.free();
-   obj1.free();
-@@ -2559,11 +2517,7 @@
-       }
-     }
-     if (!obj1.isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       colorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      colorSpace = GfxColorSpace::parse(&obj1);
--#endif
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2648,11 +2602,7 @@
- 	  obj2.free();
- 	}
-       }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      maskColorSpace = GfxColorSpace::parse(&obj1);
--#endif
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2758,7 +2708,7 @@
-  err2:
-   obj1.free();
-  err1:
--  error(getPos(), const_cast<char*>("Bad image parameters"));
-+  error(errInternal, getPos(), const_cast<char*>("Bad image parameters"));
- }
- 
- void PdfParser::doForm(Object *str) {
-@@ -2783,7 +2733,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -2791,7 +2741,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &bboxObj);
-   if (!bboxObj.isArray()) {
-     bboxObj.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -2827,11 +2777,7 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
--#else
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
--#endif
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
-@@ -2990,7 +2936,7 @@
-   parser->getObj(&obj);
-   while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
-     if (!obj.isName()) {
--      error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-+      error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-       obj.free();
-     } else {
-       key = copyString(obj.getName());
-@@ -3005,7 +2951,7 @@
-     parser->getObj(&obj);
-   }
-   if (obj.isEOF()) {
--    error(getPos(), const_cast<char*>("End of file in inline image"));
-+    error(errInternal, getPos(), const_cast<char*>("End of file in inline image"));
-     obj.free();
-     dict.free();
-     return NULL;
-@@ -3020,11 +2966,11 @@
- }
- 
- void PdfParser::opImageData(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'ID' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator"));
- }
- 
- void PdfParser::opEndImage(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'EI' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator"));
- }
- 
- //------------------------------------------------------------------------
-diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp
---- old/src/extension/internal/pdfinput/svg-builder.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/svg-builder.cpp	2012-05-13 20:45:22.303804308 +0200
-@@ -961,9 +961,7 @@
-     _font_style = sp_repr_css_attr_new();
-     GfxFont *font = state->getFont();
-     // Store original name
--    if (font->getOrigName()) {
--        _font_specification = font->getOrigName()->getCString();
--    } else if (font->getName()) {
-+    if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-     } else {
-         _font_specification = (char*) "Arial";
diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD
deleted file mode 100644
index 04965a823..000000000
--- a/testing/iproute2/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 168945 2012-10-16 17:02:14Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=iproute2
-pkgver=3.6.0
-pkgrel=2
-pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'db' 'iptables')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-groups=('base')
-provides=('iproute')
-conflicts=('iproute')
-replaces=('iproute')
-options=('!makeflags')
-backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
-	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
-source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
-         iproute2-fhs.patch)
-sha1sums=('6fa16fd2158d0f289ef454cad46555ead1c33c2d'
-          '35b8cf2dc94b73eccad427235c07596146cd6f6c')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # set correct fhs structure
-  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
-
-  ./configure
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # allow loopback to be started before /usr is mounted, this may not be supported in the future
-  mkdir -p "$pkgdir/sbin"
-  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
-  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
-
-  # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
-  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
-}
diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch
deleted file mode 100644
index add3635ca..000000000
--- a/testing/iproute2/iproute2-fhs.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
---- iproute2-3.4.0/Makefile	2012-05-21 23:12:19.000000000 +0200
-+++ iproute2-3.4.0.new/Makefile	2012-06-18 10:23:53.896760158 +0200
-@@ -1,7 +1,8 @@
- ROOTDIR=$(DESTDIR)
- PREFIX=/usr
- LIBDIR=$(PREFIX)/lib
--SBINDIR=/sbin
-+SBINDIR=/usr/sbin
-+SHAREDIR=/usr/share
- CONFDIR=/etc/iproute2
- DATADIR=$(PREFIX)/share
- DOCDIR=$(DATADIR)/doc/iproute2
-diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
---- iproute2-3.4.0/netem/Makefile	2012-05-21 23:12:19.000000000 +0200
-+++ iproute2-3.4.0.new/netem/Makefile	2012-06-18 10:23:53.896760158 +0200
-@@ -20,9 +20,9 @@
- 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
- 
- install: all
--	mkdir -p $(DESTDIR)$(LIBDIR)/tc
-+	mkdir -p $(DESTDIR)$(SHAREDIR)/tc
- 	for i in $(DISTDATA); \
--	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
-+	do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
- 	done
- 
- clean:
-diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
---- iproute2-3.4.0/tc/Makefile	2012-05-21 23:12:19.000000000 +0200
-+++ iproute2-3.4.0.new/tc/Makefile	2012-06-18 10:23:53.893426840 +0200
-@@ -105,18 +105,11 @@
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	mkdir -p $(MODDESTDIR)
-+	mkdir -p $(DESTDIR)$(LIBDIR)/tc
- 	install -m 0755 tc $(DESTDIR)$(SBINDIR)
- 	for i in $(TCSO); \
--	do install -m 755 $$i $(MODDESTDIR); \
-+	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
- 	done
--	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
--	if [ -f $(MODDESTDIR)/m_xt.so ]; \
--		then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
--	elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
--		then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
--	fi; \
--	fi
- 
- clean:
- 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
-diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c
---- iproute2-3.4.0/tc/tc_util.c	2012-05-21 23:12:19.000000000 +0200
-+++ iproute2-3.4.0.new/tc/tc_util.c	2012-06-18 10:23:53.893426840 +0200
-@@ -24,8 +24,8 @@
- #include "utils.h"
- #include "tc_util.h"
- 
--#ifndef LIBDIR
--#define LIBDIR "/usr/lib"
-+#ifndef SHAREDIR
-+#define SHAREDIR "/usr/share"
- #endif
- 
- const char *get_tc_lib(void)
-@@ -34,7 +34,7 @@
- 
- 	lib_dir = getenv("TC_LIB_DIR");
- 	if (!lib_dir)
--		lib_dir = LIBDIR "/tc/";
-+		lib_dir = SHAREDIR "/tc/";
- 
- 	return lib_dir;
- }
diff --git a/testing/iptables/0503-extension_cppflags.patch b/testing/iptables/0503-extension_cppflags.patch
deleted file mode 100644
index 0eb645731..000000000
--- a/testing/iptables/0503-extension_cppflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/extensions/GNUmakefile.in
-===================================================================
---- a/extensions/GNUmakefile.in	2012-03-27 12:14:05.000000000 -0400
-+++ b/extensions/GNUmakefile.in	2012-03-27 16:03:48.378790221 -0400
-@@ -21,7 +21,7 @@
- kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
- 
- AM_CFLAGS       = ${regular_CFLAGS}
--AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
-+AM_CPPFLAGS     = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
- AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
- AM_LDFLAGS      = @noundef_LDFLAGS@
- 
diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD
deleted file mode 100644
index a97879edc..000000000
--- a/testing/iptables/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 168758 2012-10-15 18:45:48Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=iptables
-pkgver=1.4.16.2
-pkgrel=1
-pkgdesc='Linux kernel packet control tool'
-arch=('i686' 'x86_64')
-license=('GPL2')
-url='http://www.netfilter.org/projects/iptables/index.html'
-depends=('glibc' 'bash')
-makedepends=('linux-api-headers')
-options=('!libtool')
-source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
-        iptables
-        ip6tables
-        empty.rules
-        simple_firewall.rules
-        iptables.conf.d
-        empty-filter.rules
-        empty-mangle.rules
-        empty-nat.rules
-        empty-raw.rules
-        empty-security.rules
-        0503-extension_cppflags.patch
-        iptables.service
-        ip6tables.service
-        iptables-flush)
-backup=(etc/conf.d/iptables)
-sha1sums=('6fd368c4f6c31752011a716cccd951601157a493'
-          '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
-          '2db68906b603e5268736f48c8e251f3a49da1d75'
-          '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
-          '9907f9e815592837abc7fa3264a401567b7606ab'
-          'cdb830137192bbe002c6d01058656bd053ed0ddd'
-          'd9f9f06b46b4187648e860afa0552335aafe3ce4'
-          'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
-          '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
-          '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
-          'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
-          '44626980a52e49f345a0b1e1ca03060f3a35763c'
-          '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9'
-          'f1f16f44c6a5547b6f251d13007fe6585761e8b0'
-          'e7abda09c61142121b6695928d3b71ccd8fdf73a')
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # use system one
-  rm include/linux/types.h
-
-  patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
-
- ./configure --prefix=/usr \
-     --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
-     --with-xtlibdir=/usr/lib/iptables \
-     --enable-devel --enable-libipq \
-     --enable-shared 
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"
-  install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
-  install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
-  install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
-  install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
-  install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
-
-  mkdir -p "${pkgdir}"/var/lib/iptables
-  install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
-
-  # install systemd files
-  install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service
-  install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service
-  install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush  
-}
-
diff --git a/testing/iptables/empty-filter.rules b/testing/iptables/empty-filter.rules
deleted file mode 100644
index 5a4de4876..000000000
--- a/testing/iptables/empty-filter.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables filter table rule file
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-mangle.rules b/testing/iptables/empty-mangle.rules
deleted file mode 100644
index 49d493c4d..000000000
--- a/testing/iptables/empty-mangle.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# Empty iptables mangle table rules file
-*mangle
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-nat.rules b/testing/iptables/empty-nat.rules
deleted file mode 100644
index 437e96411..000000000
--- a/testing/iptables/empty-nat.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Empty iptables nat table rules file
-*nat
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-raw.rules b/testing/iptables/empty-raw.rules
deleted file mode 100644
index 8dc50d23e..000000000
--- a/testing/iptables/empty-raw.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Empty iptables raw table rules file
-*raw
-:PREROUTING ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-security.rules b/testing/iptables/empty-security.rules
deleted file mode 100644
index 4531fa13f..000000000
--- a/testing/iptables/empty-security.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables security table rules file
-*security
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty.rules b/testing/iptables/empty.rules
deleted file mode 100644
index e24e1aa30..000000000
--- a/testing/iptables/empty.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables rule file
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/ip6tables b/testing/iptables/ip6tables
deleted file mode 100755
index 2d119e3ed..000000000
--- a/testing/iptables/ip6tables
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -f "$IP6TABLES_CONF" ]; then
-			echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2
-			exit 1
-		fi
-		stat_busy "Starting IP6 Tables"
-		if [ "$IPTABLES_FORWARD" = "1" ]; then
-			echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
-			echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
-		fi
-		if ck_daemon ip6tables; then
-			/usr/sbin/ip6tables-restore < $IP6TABLES_CONF
-			if [ $? -gt 0 ]; then
-				stat_fail
-			else
-				add_daemon ip6tables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy "Stopping IP6 Tables"
-		if ! ck_daemon ip6tables; then
-			fail=0
-			for table in $(cat /proc/net/ip6_tables_names); do
-				ip6tables-restore < /var/lib/iptables/empty-$table.rules
-				[ $? -gt 0 ] && fail=1
-			done
-			if [ $fail -gt 0 ]; then
-				stat_fail
-			else
-				rm_daemon ip6tables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	save)
-		stat_busy "Saving IP6 Tables"
-		/usr/sbin/ip6tables-save >$IP6TABLES_CONF
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-		fi
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/ip6tables.service b/testing/iptables/ip6tables.service
deleted file mode 100644
index 9a695f31e..000000000
--- a/testing/iptables/ip6tables.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=IPv6 Packet Filtering Framework
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
-ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/iptables/iptables b/testing/iptables/iptables
deleted file mode 100755
index fbb02face..000000000
--- a/testing/iptables/iptables
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -f "$IPTABLES_CONF" ]; then
-			echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
-			exit 1
-		fi
-		stat_busy "Starting IP Tables"
-		if [ "$IPTABLES_FORWARD" = "1" ]; then
-			echo 1 >/proc/sys/net/ipv4/ip_forward
-		fi
-		if ck_daemon iptables; then
-			/usr/sbin/iptables-restore < $IPTABLES_CONF
-			if [ $? -gt 0 ]; then
-				stat_fail
-			else
-				add_daemon iptables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy "Stopping IP Tables"
-		if ! ck_daemon iptables; then
-			fail=0
-			for table in $(cat /proc/net/ip_tables_names); do
-				iptables-restore < /var/lib/iptables/empty-$table.rules
-				[ $? -gt 0 ] && fail=1
-			done
-			if [ $fail -gt 0 ]; then
-				stat_fail
-			else
-				rm_daemon iptables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	save)
-		stat_busy "Saving IP Tables"
-		/usr/sbin/iptables-save >$IPTABLES_CONF
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-		fi
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/iptables-1.4.12-fixresore.patch b/testing/iptables/iptables-1.4.12-fixresore.patch
deleted file mode 100644
index 94358f779..000000000
--- a/testing/iptables/iptables-1.4.12-fixresore.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur iptables-1.4.12.2/iptables/ip6tables-restore.c iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c
---- iptables-1.4.12.2/iptables/ip6tables-restore.c	2012-01-03 02:19:09.000000000 +0900
-+++ iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c	2012-03-01 10:56:10.000000000 +0900
-@@ -380,9 +380,9 @@
- 			quote_open = 0;
- 			escaped = 0;
- 			param_len = 0;
-+			char param_buffer[1024];
- 
- 			for (curchar = parsestart; *curchar; curchar++) {
--				char param_buffer[1024];
- 
- 				if (quote_open) {
- 					if (escaped) {
-diff -Nur iptables-1.4.12.2/iptables/iptables-restore.c iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c
---- iptables-1.4.12.2/iptables/iptables-restore.c	2012-01-03 02:19:09.000000000 +0900
-+++ iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c	2012-03-01 10:56:00.000000000 +0900
-@@ -377,9 +377,9 @@
- 			quote_open = 0;
- 			escaped = 0;
- 			param_len = 0;
-+			char param_buffer[1024];
- 
- 			for (curchar = parsestart; *curchar; curchar++) {
--				char param_buffer[1024];
- 
- 				if (quote_open) {
- 					if (escaped) {
diff --git a/testing/iptables/iptables-flush b/testing/iptables/iptables-flush
deleted file mode 100755
index e6fafe950..000000000
--- a/testing/iptables/iptables-flush
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Usage: iptables-flush [6]
-#
-
-iptables=ip$1tables
-if ! type -p "$iptables"; then
-  echo "error: invalid argument"
-  exit 1
-fi
-
-while read -r table; do
-  tables+=("/var/lib/$iptables/empty-$table.rules")
-done <"/proc/net/ip$1_tables_names"
-
-if (( ${#tables[*]} )); then
-  cat "${tables[@]}" | "$iptables-restore"
-fi
diff --git a/testing/iptables/iptables.conf.d b/testing/iptables/iptables.conf.d
deleted file mode 100644
index 1c6cc7b5d..000000000
--- a/testing/iptables/iptables.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for iptables rules
-IPTABLES_CONF=/etc/iptables/iptables.rules
-IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-# Enable IP forwarding (both IPv4 and IPv6)
-# NOTE: this is not the recommended way to do this, and is supported only for
-# backward compatibility. Instead, use /etc/sysctl.conf and set the following
-# options:
-# * net.ipv4.ip_forward=1
-# * net.ipv6.conf.default.forwarding=1
-# * net.ipv6.conf.all.forwarding=1
-#IPTABLES_FORWARD=0
diff --git a/testing/iptables/iptables.service b/testing/iptables/iptables.service
deleted file mode 100644
index 3084f53b7..000000000
--- a/testing/iptables/iptables.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Packet Filtering Framework
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
-ExecStop=/usr/lib/systemd/scripts/iptables-flush
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/iptables/simple_firewall.rules b/testing/iptables/simple_firewall.rules
deleted file mode 100644
index e1604cc36..000000000
--- a/testing/iptables/simple_firewall.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
--A INPUT -p icmp -j ACCEPT 
--A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT 
--A INPUT -i lo -j ACCEPT 
--A INPUT -p tcp -j REJECT --reject-with tcp-reset 
--A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable 
--A INPUT -j REJECT --reject-with icmp-proto-unreachable 
-COMMIT
diff --git a/testing/iputils/PKGBUILD b/testing/iputils/PKGBUILD
deleted file mode 100644
index 995352da8..000000000
--- a/testing/iputils/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 169051 2012-10-17 14:09:37Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=iputils
-pkgver=20121011
-pkgrel=1
-pkgdesc="IP Configuration Utilities (and Ping)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.linuxfoundation.org/en/Net:Iputils"
-groups=('base')
-depends=('openssl' 'sysfsutils' 'libcap')
-optdepends=('xinetd: for tftpd')
-makedepends=('docbook2x' 'opensp')
-conflicts=('netkit-base' 'arping' 'netkit-tftpd')
-replaces=('netkit-base')
-backup=(etc/xinetd.d/tftp)
-install=${pkgname}.install
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd
-        iputils-20101006-ping-integer-overflow.patch)
-sha1sums=('3e85179746fd93000d6267bd55addfe97f321ba7'
-          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-          'ec78574d798b53e4f8bdd37e42514fc17ed71667')
-
-build() {
-  cd "${srcdir}/${pkgname}-s${pkgver}"
-
-  # Use our CFLAGS
-  sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
-
-  # FS#28897
-  patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch 
-
-  make
-
-  cd doc
-  for file in *.sgml; do
-    xf=${file/.sgml/.xml}
-    osx -xlower -xno-nl-in-tag $file > $xf || true
-    sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
-    docbook2man $xf
-  done
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-s${pkgver}"
-
-  install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
-
-  install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
-    "${pkgdir}"/usr/sbin/
-
-  install -m755 ping{,6} "${pkgdir}"/usr/bin/
-   ln -sf /usr/bin/ping{,6}  "${pkgdir}"/bin/
-
-   install -dm755 "${pkgdir}"/usr/share/man/man8
-   install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
-     "${pkgdir}"/usr/share/man/man8/
-
-  cd "${pkgdir}"/usr/share/man/man8
-  ln -sf ping.8.gz  ping6.8.gz
-  ln -sf tracepath.8.gz tracepath6.8.gz
-
-  # FS#24768
-  install -dm755 "${pkgdir}"/etc/xinetd.d/
-  install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/iputils/iputils-20101006-ping-integer-overflow.patch b/testing/iputils/iputils-20101006-ping-integer-overflow.patch
deleted file mode 100644
index 720e5e888..000000000
--- a/testing/iputils/iputils-20101006-ping-integer-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20101006/ping_common.c	2010-10-06 13:59:20.000000000 +0200
-+++ iputils-s20101006-patched/ping_common.c	2012-03-09 16:42:46.878151032 +0100
-@@ -590,7 +590,7 @@
- 
- 			/* If we are here, recvmsg() is unable to wait for
- 			 * required timeout. */
--			if (1000*next <= 1000000/(int)HZ) {
-+			if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) {
- 				/* Very short timeout... So, if we wait for
- 				 * something, we sleep for MININTERVAL.
- 				 * Otherwise, spin! */
diff --git a/testing/iputils/iputils.install b/testing/iputils/iputils.install
deleted file mode 100644
index 8e5159e83..000000000
--- a/testing/iputils/iputils.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  setcap cap_net_raw=ep usr/bin/ping  2>/dev/null || chmod +s usr/bin/ping 
-  setcap cap_net_raw=ep usr/bin/ping6 2>/dev/null || chmod +s usr/bin/ping6
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/iputils/tftp.xinetd b/testing/iputils/tftp.xinetd
deleted file mode 100644
index 26041a3f9..000000000
--- a/testing/iputils/tftp.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service tftp
-{
-	socket_type	= dgram
-	protocol	= udp
-	wait		= yes
-	user		= nobody
-	server		= /usr/sbin/tftpd
-	server_args	= /var/tftpboot
-	disable		= yes
-}
diff --git a/testing/irqbalance/PKGBUILD b/testing/irqbalance/PKGBUILD
deleted file mode 100644
index 52c5ae477..000000000
--- a/testing/irqbalance/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Martin Striz <ms@poruba.net>
-
-pkgname=irqbalance
-_realver=1.0.3
-pkgver=1.0.3.20110809
-pkgrel=1
-pkgdesc="IRQ balancing daemon for SMP systems"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/irqbalance"
-license=('GPL')
-depends=(glib2 numactl libcap-ng)
-makedepends=(pkgconfig)
-backup=(etc/conf.d/irqbalance)
-source=(http://irqbalance.googlecode.com/files/irqbalance-$_realver.tar.gz
-        irqbalance-2011-08-09.patch
-        irqbalance.conf.d
-        irqbalance.rc.d
-        irqbalance.service)
-md5sums=('6f246481d6295bcb9a79751c03207c96'
-         '49a5669fc3eb452a5d24abec887f0a6a'
-         '336c1ee99818f9ecda1687e34c69fd6b'
-         'fb82fc5d267d39110baf720d81282a7c'
-         '9e82dc471128117982a8dd0c4bd5f246')
-
-build() {
-  cd "$srcdir/$pkgname-$_realver"
-  patch -Np1 < ../irqbalance-2011-08-09.patch
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_realver"
-  make install DESTDIR="$pkgdir"
-  install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance
-  install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance
-  install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service
-}
diff --git a/testing/irqbalance/irqbalance-2011-08-09.patch b/testing/irqbalance/irqbalance-2011-08-09.patch
deleted file mode 100644
index fcdb8bdbf..000000000
--- a/testing/irqbalance/irqbalance-2011-08-09.patch
+++ /dev/null
@@ -1,1584 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index f5e9428..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,3 +0,0 @@
--This is all tracked in the SVN repo.  This file is just here to keep the
--autotools from complaining
--
-diff --git a/Makefile.am b/Makefile.am
-index 9847232..188e34f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,17 +22,17 @@
- 
- AUTOMAKE_OPTIONS = no-dependencies
- ACLOCAL_AMFLAGS = -I m4
--EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4 misc/irqbalance.service
-- 
-+EXTRA_DIST = INSTALL COPYING autogen.sh misc/irqbalance.service
-+
- INCLUDES = -I${top_srcdir} 
--LIBS = $(CAPNG_LDADD) $(GLIB_LIBS) @LIBS@
--AM_CFLAGS = $(GLIB_CFLAGS)
-+AM_CFLAGS = $(LIBCAP_NG_CFLAGS) $(GLIB_CFLAGS)
- AM_CPPFLAGS = -W -Wall -Wshadow -Wformat -Wundef -D_GNU_SOURCE
- noinst_HEADERS = bitmap.h constants.h cpumask.h irqbalance.h non-atomic.h \
- 	types.h
- sbin_PROGRAMS = irqbalance
- irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \
--	irqlist.c numa.c placement.c powermode.c procinterrupts.c
-+	irqlist.c numa.c placement.c procinterrupts.c
-+irqbalance_LDADD = $(LIBCAP_NG_LIBS) $(GLIB_LIBS)
- dist_man_MANS = irqbalance.1
- 
- CONFIG_CLEAN_FILES = debug*.list config/*
-@@ -40,3 +40,6 @@ clean-generic:
- 	rm -rf autom4te*.cache 
- 	rm -f *.rej *.orig *~
- 
-+if LOCAL_GLIB
-+SUBDIRS = glib-local
-+endif
-diff --git a/NEWS b/NEWS
-deleted file mode 100644
-index 7cc0277..0000000
---- a/NEWS
-+++ /dev/null
-@@ -1 +0,0 @@
--No news currently
-diff --git a/README b/README
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/activate.c b/activate.c
-index 292c44a..02fc8dc 100644
---- a/activate.c
-+++ b/activate.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -31,34 +32,63 @@
- 
- #include "irqbalance.h"
- 
-+static int check_affinity(struct irq_info *info, cpumask_t applied_mask)
-+{
-+	cpumask_t current_mask;
-+	char buf[PATH_MAX];
-+	char *line = NULL;
-+	size_t size = 0;
-+	FILE *file;
-+
-+	sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq);
-+	file = fopen(buf, "r");
-+	if (!file)
-+		return 1;
-+	if (getline(&line, &size, file)==0) {
-+		free(line);
-+		fclose(file);
-+		return 1;
-+	}
-+	cpumask_parse_user(line, strlen(line), current_mask);
-+	fclose(file);
-+	free(line);
-+
-+	return cpus_equal(applied_mask, current_mask);
-+}
- 
- static void activate_mapping(struct irq_info *info, void *data __attribute__((unused)))
- {
- 	char buf[PATH_MAX];
- 	FILE *file;
- 	cpumask_t applied_mask;
-+	int valid_mask = 0;
-+
-+	if ((hint_policy == HINT_POLICY_EXACT) &&
-+	    (!cpus_empty(info->affinity_hint))) {
-+		applied_mask = info->affinity_hint;
-+		valid_mask = 1;
-+	} else if (info->assigned_obj) {
-+		applied_mask = info->assigned_obj->mask;
-+		valid_mask = 1;
-+		if ((hint_policy == HINT_POLICY_SUBSET) &&
-+		    (!cpus_empty(info->affinity_hint)))
-+			cpus_and(applied_mask, applied_mask, info->affinity_hint);
-+	}
- 
- 	/*
-  	 * only activate mappings for irqs that have moved
-  	 */
--	if (!info->moved)
-+	if (!info->moved && (!valid_mask || check_affinity(info, applied_mask)))
- 		return;
- 
- 	if (!info->assigned_obj)
- 		return;
- 
--
- 	sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq);
- 	file = fopen(buf, "w");
- 	if (!file)
- 		return;
- 
--	if ((hint_policy == HINT_POLICY_EXACT) &&
--	    (!cpus_empty(info->affinity_hint)))
--		applied_mask = info->affinity_hint;
--	else
--		applied_mask = info->assigned_obj->mask;
--
- 	cpumask_scnprintf(buf, PATH_MAX, applied_mask);
- 	fprintf(file, "%s", buf);
- 	fclose(file);
-diff --git a/autogen.sh b/autogen.sh
-index 5ad9f14..b792e8b 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -1,4 +1,5 @@
- #! /bin/sh
- set -x -e
-+mkdir -p m4
- # --no-recursive is available only in recent autoconf versions
- autoreconf -fv --install
-diff --git a/classify.c b/classify.c
-index 124dab0..05b3bfb 100644
---- a/classify.c
-+++ b/classify.c
-@@ -52,6 +52,8 @@ static short class_codes[MAX_CLASS] = {
- };
- 
- static GList *interrupts_db;
-+static GList *new_irq_list;
-+static GList *banned_irqs;
- 
- #define SYSDEV_DIR "/sys/bus/pci/devices"
- 
-@@ -63,6 +65,30 @@ static gint compare_ints(gconstpointer a, gconstpointer b)
- 	return ai->irq - bi->irq;
- }
- 
-+void add_banned_irq(int irq)
-+{
-+	struct irq_info find, *new;
-+	GList *entry;
-+
-+	find.irq = irq;
-+	entry = g_list_find_custom(banned_irqs, &find, compare_ints);
-+	if (entry)
-+		return;
-+
-+	new = calloc(sizeof(struct irq_info), 1);
-+	if (!new) {
-+		if (debug_mode)
-+			printf("No memory to ban irq %d\n", irq);
-+		return;
-+	}
-+
-+	new->irq = irq;
-+
-+	banned_irqs = g_list_append(banned_irqs, new);
-+	return;
-+}
-+
-+			
- /*
-  * Inserts an irq_info struct into the intterupts_db list
-  * devpath points to the device directory in sysfs for the 
-@@ -90,6 +116,13 @@ static struct irq_info *add_one_irq_to_db(const char *devpath, int irq)
- 		return NULL;
- 	}
- 
-+	entry = g_list_find_custom(banned_irqs, &find, compare_ints);
-+	if (entry) {
-+		if (debug_mode)
-+			printf("SKIPPING BANNED IRQ %d\n", irq);
-+		return NULL;
-+	}
-+
- 	new = calloc(sizeof(struct irq_info), 1);
- 	if (!new)
- 		return NULL;
-@@ -175,6 +208,43 @@ out:
- 	return new;
- }
- 
-+static int check_for_irq_ban(char *path, int irq)
-+{
-+	char *cmd;
-+	int rc;
-+
-+	if (!banscript)
-+		return 0;
-+
-+	cmd = alloca(strlen(path)+strlen(banscript)+32);
-+	if (!cmd)
-+		return 0;
-+	
-+	sprintf(cmd, "%s %s %d",banscript, path, irq);
-+	rc = system(cmd);
-+
-+	/*
-+ 	 * The system command itself failed
-+ 	 */
-+	if (rc == -1) {
-+		if (debug_mode)
-+			printf("%s failed, please check the --banscript option\n", cmd);
-+		else
-+			syslog(LOG_INFO, "%s failed, please check the --banscript option\n", cmd);
-+		return 0;
-+	}
-+
-+	if (WEXITSTATUS(rc)) {
-+		if (debug_mode)
-+			printf("irq %d is baned by %s\n", irq, banscript);
-+		else
-+			syslog(LOG_INFO, "irq %d is baned by %s\n", irq, banscript);
-+		return 1;
-+	}
-+	return 0;
-+
-+}
-+
- /*
-  * Figures out which interrupt(s) relate to the device we're looking at in dirname
-  */
-@@ -199,6 +269,10 @@ static void build_one_dev_entry(const char *dirname)
- 			irqnum = strtol(entry->d_name, NULL, 10);
- 			if (irqnum) {
- 				sprintf(path, "%s/%s", SYSDEV_DIR, dirname);
-+				if (check_for_irq_ban(path, irqnum)) {
-+					add_banned_irq(irqnum);
-+					continue;
-+				}
- 				new = add_one_irq_to_db(path, irqnum);
- 				if (!new)
- 					continue;
-@@ -221,6 +295,11 @@ static void build_one_dev_entry(const char *dirname)
- 	 */
- 	if (irqnum) {
- 		sprintf(path, "%s/%s", SYSDEV_DIR, dirname);
-+		if (check_for_irq_ban(path, irqnum)) {
-+			add_banned_irq(irqnum);
-+			goto done;
-+		}
-+
- 		new = add_one_irq_to_db(path, irqnum);
- 		if (!new)
- 			goto done;
-@@ -248,6 +327,8 @@ void rebuild_irq_db(void)
- {
- 	DIR *devdir = opendir(SYSDEV_DIR);
- 	struct dirent *entry;
-+	GList *gentry;
-+	struct irq_info *ninfo, *iinfo;
- 
- 	free_irq_db();
- 		
-@@ -263,22 +344,46 @@ void rebuild_irq_db(void)
- 	build_one_dev_entry(entry->d_name);
- 
- 	} while (entry != NULL);
-+
- 	closedir(devdir);
-+
-+	if (!new_irq_list)
-+		return;
-+	gentry = g_list_first(new_irq_list);	
-+	while(gentry) {
-+		ninfo = gentry->data;
-+		iinfo = get_irq_info(ninfo->irq);
-+		new_irq_list = g_list_remove(gentry, ninfo);
-+		if (!iinfo) {
-+			if (debug_mode)
-+				printf("Adding untracked IRQ %d to database\n", ninfo->irq);
-+			interrupts_db = g_list_append(interrupts_db, ninfo);
-+		} else 
-+			free(ninfo);
-+
-+		gentry = g_list_first(new_irq_list);
-+	}
-+	g_list_free(new_irq_list);
-+	new_irq_list = NULL;
-+		
- }
- 
--struct irq_info *add_misc_irq(int irq)
-+struct irq_info *add_new_irq(int irq)
- {
--	struct irq_info *new;
-+	struct irq_info *new, *nnew;
- 
- 	new = calloc(sizeof(struct irq_info), 1);
--	if (!new)
-+	nnew = calloc(sizeof(struct irq_info), 1);
-+	if (!new || !nnew)
- 		return NULL;
- 
- 	new->irq = irq;
- 	new->type = IRQ_TYPE_LEGACY;
- 	new->class = IRQ_OTHER;
- 	new->numa_node = get_numa_node(-1);
-+	memcpy(nnew, new, sizeof(struct irq_info));
- 	interrupts_db = g_list_append(interrupts_db, new);
-+	new_irq_list = g_list_append(new_irq_list, nnew);
- 	return new;
- }
- 
-@@ -307,7 +412,7 @@ struct irq_info *get_irq_info(int irq)
- void migrate_irq(GList **from, GList **to, struct irq_info *info)
- {
- 	GList *entry;
--	struct irq_info find, *tmp;;
-+	struct irq_info find, *tmp;
- 
- 	find.irq = info->irq;
- 	entry = g_list_find_custom(*from, &find, compare_ints);
-@@ -325,18 +430,9 @@ static gint sort_irqs(gconstpointer A, gconstpointer B)
-         a = (struct irq_info*)A;
-         b = (struct irq_info*)B;
- 
--	if (a->class < b->class)
--		return 1;
--	if (a->class > b->class)
--		return -1;
--	if (a->load < b->load)
--		return 1;
--	if (a->load > b->load)
--		return -1;
--	if (a<b)
-+	if (a->class < b->class || a->load < b->load || a < b)
- 		return 1;
-         return -1;
--
- }
- 
- void sort_irq_list(GList **list)
-diff --git a/configure.ac b/configure.ac
-index eed55ba..1230d66 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,49 +1,12 @@
--dnl
--define([AC_INIT_NOTICE],
--[### Generated automatically using autoconf version] AC_ACVERSION [
--### Copyright 2009 Steve Grubb <sgrubb@redhat.com>
--###
--### 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 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.
--###
--### For usage, run `./configure --help'
--### For more detailed information on installation, read the file `INSTALL'.
--###
--### If configuration succeeds, status is in the file `config.status'.
--### A log of configuration tests is in `config.log'.
--])
--
--AC_REVISION($Revision: 1.3 $)dnl
- AC_INIT(irqbalance,1.0.3)
- AC_PREREQ(2.12)dnl
- AM_CONFIG_HEADER(config.h)
- 
--echo Configuring irqbalance $VERSION
--
- AC_CONFIG_MACRO_DIR([m4])
--AC_CANONICAL_TARGET
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- AM_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- 
--AC_MSG_NOTICE()
--AC_MSG_NOTICE([Checking for programs])
--
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_AWK
-@@ -55,9 +18,6 @@ AS_IF([test "$enable_numa" = "no"],[
-   ac_cv_lib_numa_numa_available=no
- ])
- 
--AC_MSG_NOTICE
--AC_MSG_NOTICE([echo Checking for header files])
--
- AC_HEADER_STDC
- AC_CHECK_HEADERS([numa.h])
- 
-@@ -70,10 +30,57 @@ AC_C_CONST
- AC_C_INLINE
- AM_PROG_CC_C_O
- 
--PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
--LIBCAP_NG_PATH
-+AC_ARG_WITH([glib2],
-+  [AS_HELP_STRING([--without-glib2],
-+    [Don't use system glib2 library. Use local implementation instead.])],
-+  [],
-+  [with_glib2=check])
-+
-+local_glib2=
-+AS_IF(
-+  [test "x$with_glib2" = xyes],
-+  [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])],
-+  
-+  [test "x$with_glib2" = xno],
-+  [local_glib2="yes"],
-+
-+  [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28], [], [local_glib2="yes"])]
-+)
-+
-+AS_IF(
-+  [test "x$local_glib2" = xyes],
-+  [
-+  GLIB_CFLAGS=-I./glib-local
-+  GLIB_LIBS=glib-local/libglib.a
-+  AC_SUBST(GLIB_CFLAGS)
-+  AC_SUBST(GLIB_LIBS)
-+  AC_MSG_WARN(Using locale implementation of GList functions)
-+  ]
-+)
-+
-+AM_CONDITIONAL([LOCAL_GLIB], [test "x$local_glib2" = "xyes"])
-+
-+AC_ARG_WITH([libcap-ng],
-+  AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@]))
-+
-+AS_IF(
-+  [test "x$libcap_ng" != "xno"],
-+  [
-+  PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng],
-+    [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])],
-+    [
-+     AS_IF(
-+       [test "x$libcap_ng" = "xyes"],
-+       [
-+       AC_MSG_ERROR([libcap-ng not found])
-+       ]
-+       )
-+    ]
-+  )
-+  ]
-+)
- 
--AC_OUTPUT(Makefile)
-+AC_OUTPUT(Makefile glib-local/Makefile)
- 
- AC_MSG_NOTICE()
- AC_MSG_NOTICE([irqbalance Version:     $VERSION])
-diff --git a/cputree.c b/cputree.c
-index af4fd3a..9568967 100644
---- a/cputree.c
-+++ b/cputree.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-diff --git a/glib-local/Makefile.am b/glib-local/Makefile.am
-new file mode 100644
-index 0000000..336b56e
---- /dev/null
-+++ b/glib-local/Makefile.am
-@@ -0,0 +1,8 @@
-+## Process this file with automake to produce Makefile.in
-+noinst_LIBRARIES = libglib.a
-+
-+libglib_a_SOURCES = glist.c
-+
-+libglib_a_CFLAGS = @GLIB_CFLAGS@
-+
-+noinst_HEADERS = glib.h glist.h
-diff --git a/glib-local/glib.h b/glib-local/glib.h
-new file mode 100644
-index 0000000..5874892
---- /dev/null
-+++ b/glib-local/glib.h
-@@ -0,0 +1 @@
-+#include <glist.h>
-diff --git a/glib-local/glist.c b/glib-local/glist.c
-new file mode 100644
-index 0000000..6fa1761
---- /dev/null
-+++ b/glib-local/glist.c
-@@ -0,0 +1,381 @@
-+#include <stdlib.h>
-+
-+#include "glist.h"
-+
-+/**
-+ * g_list_free: 
-+ * @list: a #GList
-+ *
-+ * Frees all of the memory used by a #GList.
-+ * The freed elements are returned to the slice allocator.
-+ *
-+ * <note><para>
-+ * If list elements contain dynamically-allocated memory, 
-+ * you should either use g_list_free_full() or free them manually
-+ * first.
-+ * </para></note>
-+ */
-+void
-+g_list_free (GList *list)
-+{
-+	GList *l = list;
-+
-+	while(l) {
-+		GList *tmp = l->next;
-+		free(l);
-+		l = tmp;
-+	}
-+}
-+
-+/**
-+ * g_list_last:
-+ * @list: a #GList
-+ *
-+ * Gets the last element in a #GList.
-+ *
-+ * Returns: the last element in the #GList, 
-+ *     or %NULL if the #GList has no elements
-+ */
-+GList*
-+g_list_last (GList *list)
-+{
-+  if (list)
-+    {
-+      while (list->next)
-+	list = list->next;
-+    }
-+  
-+  return list;
-+}
-+
-+/**
-+ * g_list_append:
-+ * @list: a pointer to a #GList
-+ * @data: the data for the new element
-+ *
-+ * Adds a new element on to the end of the list.
-+ *
-+ * <note><para>
-+ * The return value is the new start of the list, which 
-+ * may have changed, so make sure you store the new value.
-+ * </para></note>
-+ *
-+ * <note><para>
-+ * Note that g_list_append() has to traverse the entire list 
-+ * to find the end, which is inefficient when adding multiple 
-+ * elements. A common idiom to avoid the inefficiency is to prepend 
-+ * the elements and reverse the list when all elements have been added.
-+ * </para></note>
-+ *
-+ * |[
-+ * /&ast; Notice that these are initialized to the empty list. &ast;/
-+ * GList *list = NULL, *number_list = NULL;
-+ *
-+ * /&ast; This is a list of strings. &ast;/
-+ * list = g_list_append (list, "first");
-+ * list = g_list_append (list, "second");
-+ * 
-+ * /&ast; This is a list of integers. &ast;/
-+ * number_list = g_list_append (number_list, GINT_TO_POINTER (27));
-+ * number_list = g_list_append (number_list, GINT_TO_POINTER (14));
-+ * ]|
-+ *
-+ * Returns: the new start of the #GList
-+ */
-+GList*
-+g_list_append (GList	*list,
-+	       gpointer	 data)
-+{
-+  GList *new_list;
-+  GList *last;
-+  
-+  new_list = malloc(sizeof(*new_list));
-+  new_list->data = data;
-+  new_list->next = NULL;
-+  
-+  if (list)
-+    {
-+      last = g_list_last (list);
-+      /* g_assert (last != NULL); */
-+      last->next = new_list;
-+      new_list->prev = last;
-+
-+      return list;
-+    }
-+  else
-+    {
-+      new_list->prev = NULL;
-+      return new_list;
-+    }
-+}
-+
-+static inline GList*
-+_g_list_remove_link (GList *list,
-+		     GList *link)
-+{
-+  if (link)
-+    {
-+      if (link->prev)
-+	link->prev->next = link->next;
-+      if (link->next)
-+	link->next->prev = link->prev;
-+      
-+      if (link == list)
-+	list = list->next;
-+      
-+      link->next = NULL;
-+      link->prev = NULL;
-+    }
-+  
-+  return list;
-+}
-+
-+/**
-+ * g_list_delete_link:
-+ * @list: a #GList
-+ * @link_: node to delete from @list
-+ *
-+ * Removes the node link_ from the list and frees it. 
-+ * Compare this to g_list_remove_link() which removes the node 
-+ * without freeing it.
-+ *
-+ * Returns: the new head of @list
-+ */
-+GList*
-+g_list_delete_link (GList *list,
-+		    GList *link_)
-+{
-+  list = _g_list_remove_link (list, link_);
-+  free (link_);
-+
-+  return list;
-+}
-+
-+/**
-+ * g_list_first:
-+ * @list: a #GList
-+ *
-+ * Gets the first element in a #GList.
-+ *
-+ * Returns: the first element in the #GList, 
-+ *     or %NULL if the #GList has no elements
-+ */
-+GList*
-+g_list_first (GList *list)
-+{
-+  if (list)
-+    {
-+      while (list->prev)
-+	list = list->prev;
-+    }
-+  
-+  return list;
-+}
-+
-+static GList *
-+g_list_sort_merge (GList     *l1, 
-+		   GList     *l2,
-+		   GFunc     compare_func,
-+		   gpointer  user_data)
-+{
-+  GList list, *l, *lprev;
-+  gint cmp;
-+
-+  l = &list; 
-+  lprev = NULL;
-+
-+  while (l1 && l2)
-+    {
-+      cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data);
-+
-+      if (cmp <= 0)
-+        {
-+	  l->next = l1;
-+	  l1 = l1->next;
-+        } 
-+      else 
-+	{
-+	  l->next = l2;
-+	  l2 = l2->next;
-+        }
-+      l = l->next;
-+      l->prev = lprev; 
-+      lprev = l;
-+    }
-+  l->next = l1 ? l1 : l2;
-+  l->next->prev = l;
-+
-+  return list.next;
-+}
-+
-+static GList* 
-+g_list_sort_real (GList    *list,
-+		  GFunc     compare_func,
-+		  gpointer  user_data)
-+{
-+  GList *l1, *l2;
-+  
-+  if (!list) 
-+    return NULL;
-+  if (!list->next) 
-+    return list;
-+  
-+  l1 = list; 
-+  l2 = list->next;
-+
-+  while ((l2 = l2->next) != NULL)
-+    {
-+      if ((l2 = l2->next) == NULL) 
-+	break;
-+      l1 = l1->next;
-+    }
-+  l2 = l1->next; 
-+  l1->next = NULL; 
-+
-+  return g_list_sort_merge (g_list_sort_real (list, compare_func, user_data),
-+			    g_list_sort_real (l2, compare_func, user_data),
-+			    compare_func,
-+			    user_data);
-+}
-+
-+/**
-+ * g_list_sort:
-+ * @list: a #GList
-+ * @compare_func: the comparison function used to sort the #GList.
-+ *     This function is passed the data from 2 elements of the #GList 
-+ *     and should return 0 if they are equal, a negative value if the 
-+ *     first element comes before the second, or a positive value if 
-+ *     the first element comes after the second.
-+ *
-+ * Sorts a #GList using the given comparison function.
-+ *
-+ * Returns: the start of the sorted #GList
-+ */
-+/**
-+ * GCompareFunc:
-+ * @a: a value.
-+ * @b: a value to compare with.
-+ * @Returns: negative value if @a &lt; @b; zero if @a = @b; positive
-+ *           value if @a > @b.
-+ *
-+ * Specifies the type of a comparison function used to compare two
-+ * values.  The function should return a negative integer if the first
-+ * value comes before the second, 0 if they are equal, or a positive
-+ * integer if the first value comes after the second.
-+ **/
-+GList *
-+g_list_sort (GList        *list,
-+	     GCompareFunc  compare_func)
-+{
-+  return g_list_sort_real (list, (GFunc) compare_func, NULL);
-+			    
-+}
-+
-+/**
-+ * g_list_length:
-+ * @list: a #GList
-+ *
-+ * Gets the number of elements in a #GList.
-+ *
-+ * <note><para>
-+ * This function iterates over the whole list to 
-+ * count its elements.
-+ * </para></note>
-+ *
-+ * Returns: the number of elements in the #GList
-+ */
-+guint
-+g_list_length (GList *list)
-+{
-+  guint length;
-+  
-+  length = 0;
-+  while (list)
-+    {
-+      length++;
-+      list = list->next;
-+    }
-+  
-+  return length;
-+}
-+
-+/**
-+ * g_list_foreach:
-+ * @list: a #GList
-+ * @func: the function to call with each element's data
-+ * @user_data: user data to pass to the function
-+ *
-+ * Calls a function for each element of a #GList.
-+ */
-+/**
-+ * GFunc:
-+ * @data: the element's data.
-+ * @user_data: user data passed to g_list_foreach() or
-+ *             g_slist_foreach().
-+ *
-+ * Specifies the type of functions passed to g_list_foreach() and
-+ * g_slist_foreach().
-+ **/
-+void
-+g_list_foreach (GList	 *list,
-+		GFunc	  func,
-+		gpointer  user_data)
-+{
-+  while (list)
-+    {
-+      GList *next = list->next;
-+      (*func) (list->data, user_data);
-+      list = next;
-+    }
-+}
-+
-+/**
-+ * g_list_free_full:
-+ * @list: a pointer to a #GList
-+ * @free_func: the function to be called to free each element's data
-+ *
-+ * Convenience method, which frees all the memory used by a #GList, and
-+ * calls the specified destroy function on every element's data.
-+ *
-+ * Since: 2.28
-+ */
-+void
-+g_list_free_full (GList          *list,
-+		  GDestroyNotify  free_func)
-+{
-+  g_list_foreach (list, (GFunc) free_func, NULL);
-+  g_list_free (list);
-+}
-+
-+/**
-+ * g_list_find_custom:
-+ * @list: a #GList
-+ * @data: user data passed to the function
-+ * @func: the function to call for each element. 
-+ *     It should return 0 when the desired element is found
-+ *
-+ * Finds an element in a #GList, using a supplied function to 
-+ * find the desired element. It iterates over the list, calling 
-+ * the given function which should return 0 when the desired 
-+ * element is found. The function takes two #gconstpointer arguments, 
-+ * the #GList element's data as the first argument and the 
-+ * given user data.
-+ *
-+ * Returns: the found #GList element, or %NULL if it is not found
-+ */
-+GList*
-+g_list_find_custom (GList         *list,
-+		    gconstpointer  data,
-+		    GCompareFunc   func)
-+{
-+  g_return_val_if_fail (func != NULL, list);
-+
-+  while (list)
-+    {
-+      if (! func (list->data, data))
-+	return list;
-+      list = list->next;
-+    }
-+
-+  return NULL;
-+}
-diff --git a/glib-local/glist.h b/glib-local/glist.h
-new file mode 100644
-index 0000000..47f2cfe
---- /dev/null
-+++ b/glib-local/glist.h
-@@ -0,0 +1,56 @@
-+#ifndef __G_LIST_H__
-+#define __G_LIST_H__
-+
-+typedef int    gint;
-+typedef unsigned int    guint;
-+typedef void* gpointer;
-+typedef const void *gconstpointer;
-+typedef gint            (*GCompareFunc)         (gconstpointer  a,
-+                                                 gconstpointer  b);
-+typedef gint            (*GCompareDataFunc)     (gconstpointer  a,
-+                                                 gconstpointer  b,
-+						 gpointer       user_data);
-+typedef void            (*GFunc)                (gpointer       data,
-+                                                 gpointer       user_data);
-+typedef void            (*GDestroyNotify)       (gpointer       data);
-+
-+struct _GList;
-+typedef struct _GList GList;
-+
-+struct _GList
-+{
-+  gpointer data;
-+  GList *next;
-+  GList *prev;
-+};
-+
-+/* Doubly linked lists
-+ */
-+void     g_list_free                    (GList            *list);
-+GList*   g_list_append                  (GList            *list,
-+					 gpointer          data);
-+GList*   g_list_delete_link             (GList            *list,
-+					 GList            *link_);
-+GList*   g_list_first                   (GList            *list);
-+GList*   g_list_sort                    (GList            *list,
-+					 GCompareFunc      compare_func);
-+guint    g_list_length                  (GList            *list);
-+void     g_list_foreach                 (GList            *list,
-+					 GFunc             func,
-+					 gpointer          user_data);
-+void     g_list_free_full               (GList            *list,
-+					 GDestroyNotify    free_func);
-+GList*   g_list_find_custom             (GList            *list,
-+					 gconstpointer     data,
-+					 GCompareFunc      func);
-+
-+#define g_list_previous(list)	        ((list) ? (((GList *)(list))->prev) : NULL)
-+#define g_list_next(list)	        ((list) ? (((GList *)(list))->next) : NULL)
-+
-+#define g_return_val_if_fail(expr,val)	do {			\
-+     if (expr) { } else						\
-+       {								\
-+	 return (val);							\
-+       }				} while(0);
-+
-+#endif /* __G_LIST_H__ */
-diff --git a/irqbalance.1 b/irqbalance.1
-index 55fc15f..20105bc 100644
---- a/irqbalance.1
-+++ b/irqbalance.1
-@@ -39,7 +39,11 @@ Causes irqbalance to be run once, after which the daemon exits
- .TP
- 
- .B --debug
--Causes irqbalance to run in the foreground and extra debug information to be printed
-+Causes irqbalance to print extra debug information.  Implies --foreground
-+
-+.TP
-+.B --foreground
-+Causes irqbalance to run in the foreground (without --debug)
- 
- .TP
- .B --hintpolicy=[exact | subset | ignore]
-@@ -62,6 +66,30 @@ average cpu softirq workload, and no cpus are more than 1 standard deviation
- above (and have more than 1 irq assigned to them), attempt to place 1 cpu in
- powersave mode.  In powersave mode, a cpu will not have any irqs balanced to it,
- in an effort to prevent that cpu from waking up without need.
-+
-+.TP
-+.B --banirq=<irqnum>
-+Add the specified irq list to the set of banned irqs. irqbalance will not affect
-+the affinity of any irqs on the banned list, allowing them to be specified
-+manually.  This option is addative and can be specified multiple times
-+
-+.TP
-+.B --banscript=<script>
-+Execute the specified script for each irq that is discovered, passing the sysfs
-+path to the associated device as the first argument, and the irq vector as the
-+second.  An exit value of 0 tells irqbalance that this interrupt should balanced
-+and managed as a normal irq, while a non-zero exit code indicates this irq
-+should be ignored by irqbalance completely (see --banirq above).  Use of this
-+script provides users the ability to dynamically select which irqs get exluded
-+from balancing, and provides an opportunity for manual affinity setting in one
-+single code point.
-+
-+.TP
-+.B --pid=<file>
-+Have irqbalance write its process id to the specified file.  By default no
-+pidfile is written.  The written pidfile is automatically unlinked when
-+irqbalance exits.
-+
- .SH "ENVIRONMENT VARIABLES"
- .TP
- .B IRQBALANCE_ONESHOT
-@@ -75,9 +103,10 @@ Same as --debug
- .B IRQBALANCE_BANNED_CPUS
- Provides a mask of cpus which irqbalance should ignore and never assign interrupts to
- 
-+.SH "SIGNALS"
- .TP
--.B IRQBALANCE_BANNED_INTERRUPTS
--A list of space delimited IRQ numbers that irqbalance should not touch
-+.B SIGHUP
-+Forces a rescan of the available irqs and system topology
- 
- .SH "Homepage"
- http://code.google.com/p/irqbalance
-diff --git a/irqbalance.c b/irqbalance.c
-index 99c5db7..fbe6ac6 100644
---- a/irqbalance.c
-+++ b/irqbalance.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -27,6 +28,10 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <time.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- #ifdef HAVE_GETOPT_LONG 
- #include <getopt.h>
- #endif
-@@ -39,12 +44,15 @@
- volatile int keep_going = 1;
- int one_shot_mode;
- int debug_mode;
-+int foreground_mode;
- int numa_avail;
--int need_cpu_rescan;
-+int need_rescan;
- extern cpumask_t banned_cpus;
- enum hp_e hint_policy = HINT_POLICY_SUBSET;
- unsigned long power_thresh = ULONG_MAX;
- unsigned long long cycle_count = 0;
-+char *pidfile = NULL;
-+char *banscript = NULL;
- 
- void sleep_approx(int seconds)
- {
-@@ -64,32 +72,45 @@ void sleep_approx(int seconds)
- struct option lopts[] = {
- 	{"oneshot", 0, NULL, 'o'},
- 	{"debug", 0, NULL, 'd'},
-+	{"foreground", 0, NULL, 'f'},
- 	{"hintpolicy", 1, NULL, 'h'},
- 	{"powerthresh", 1, NULL, 'p'},
-+	{"banirq", 1 , NULL, 'i'},
-+	{"banscript", 1, NULL, 'b'},
-+	{"pid", 1, NULL, 's'},
- 	{0, 0, 0, 0}
- };
- 
- static void usage(void)
- {
--	printf("irqbalance [--oneshot | -o] [--debug | -d] [--hintpolicy= | -h [exact|subset|ignore]]\n");
--	printf("	[--powerthresh= | -p <off> | <n>]\n");
-+	printf("irqbalance [--oneshot | -o] [--debug | -d] [--foreground | -f] [--hintpolicy= | -h [exact|subset|ignore]]\n");
-+	printf("	[--powerthresh= | -p <off> | <n>] [--banirq= | -i <n>]\n");
- }
- 
- static void parse_command_line(int argc, char **argv)
- {
- 	int opt;
- 	int longind;
-+	unsigned long val;
- 
- 	while ((opt = getopt_long(argc, argv,
--		"odh:p:",
-+		"odfh:i:p:s:",
- 		lopts, &longind)) != -1) {
- 
- 		switch(opt) {
- 			case '?':
- 				usage();
- 				exit(1);
-+				break;
-+			case 'b':
-+				banscript = strdup(optarg);
-+				break;
- 			case 'd':
- 				debug_mode=1;
-+				foreground_mode=1;
-+				break;
-+			case 'f':
-+				foreground_mode=1;
- 				break;
- 			case 'h':
- 				if (!strncmp(optarg, "exact", strlen(optarg)))
-@@ -103,6 +124,14 @@ static void parse_command_line(int argc, char **argv)
- 					exit(1);
- 				}
- 				break;
-+			case 'i':
-+				val = strtoull(optarg, NULL, 10);
-+				if (val == ULONG_MAX) {
-+					usage();
-+					exit(1);
-+				}
-+				add_banned_irq((int)val);
-+				break;
- 			case 'p':
- 				if (!strncmp(optarg, "off", strlen(optarg)))
- 					power_thresh = ULONG_MAX;
-@@ -117,6 +146,9 @@ static void parse_command_line(int argc, char **argv)
- 			case 'o':
- 				one_shot_mode=1;
- 				break;
-+			case 's':
-+				pidfile = optarg;
-+				break;
- 		}
- 	}
- }
-@@ -172,18 +204,34 @@ static void handler(int signum)
- 	keep_going = 0;
- }
- 
-+static void force_rescan(int signum)
-+{
-+	if (cycle_count)
-+		need_rescan = 1;
-+}
-+
- int main(int argc, char** argv)
- {
--	struct sigaction action;
-+	struct sigaction action, hupaction;
- 
- #ifdef HAVE_GETOPT_LONG
- 	parse_command_line(argc, argv);
- #else
--	if (argc>1 && strstr(argv[1],"--debug"))
-+	if (argc>1 && strstr(argv[1],"--debug")) {
- 		debug_mode=1;
-+		foreground_mode=1;
-+	}
-+	if (argc>1 && strstr(argv[1],"--foreground"))
-+		foreground_mode=1;
- 	if (argc>1 && strstr(argv[1],"--oneshot"))
- 		one_shot_mode=1;
- #endif
-+
-+	/*
-+ 	 * Open the syslog connection
-+ 	 */
-+	openlog(argv[0], 0, LOG_DAEMON);
-+
- 	if (getenv("IRQBALANCE_BANNED_CPUS"))  {
- 		cpumask_parse_user(getenv("IRQBALANCE_BANNED_CPUS"), strlen(getenv("IRQBALANCE_BANNED_CPUS")), banned_cpus);
- 	}
-@@ -212,17 +260,35 @@ int main(int argc, char** argv)
- 
- 
- 	/* On single core UP systems irqbalance obviously has no work to do */
--	if (core_count<2) 
-+	if (core_count<2) {
-+		char *msg = "Balaincing is ineffective on systems with a "
-+			    "single cache domain.  Shutting down\n";
-+
-+		if (debug_mode)
-+			printf("%s", msg);
-+		else
-+			syslog(LOG_INFO, "%s", msg);
- 		exit(EXIT_SUCCESS);
-+	}
- 	/* On dual core/hyperthreading shared cache systems just do a one shot setup */
- 	if (cache_domain_count==1)
- 		one_shot_mode = 1;
- 
--	if (!debug_mode)
-+	if (!foreground_mode) {
-+		int pidfd = -1;
- 		if (daemon(0,0))
- 			exit(EXIT_FAILURE);
-+		/* Write pidfile */
-+		if (pidfile && (pidfd = open(pidfile,
-+			O_WRONLY | O_CREAT | O_EXCL | O_TRUNC,
-+			S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
-+			char str[16];
-+			snprintf(str, sizeof(str), "%u\n", getpid());
-+			write(pidfd, str, strlen(str));
-+			close(pidfd);
-+		}
-+	}
- 
--	openlog(argv[0], 0, LOG_DAEMON);
- 
- #ifdef HAVE_LIBCAP_NG
- 	// Drop capabilities
-@@ -236,6 +302,11 @@ int main(int argc, char** argv)
- 	parse_proc_interrupts();
- 	parse_proc_stat();
- 
-+	hupaction.sa_handler = force_rescan;
-+	sigemptyset(&hupaction.sa_mask);
-+	hupaction.sa_flags = 0;
-+	sigaction(SIGHUP, &hupaction, NULL);
-+
- 	while (keep_going) {
- 		sleep_approx(SLEEP_INTERVAL);
- 		if (debug_mode)
-@@ -247,8 +318,8 @@ int main(int argc, char** argv)
- 		parse_proc_stat();
- 
- 		/* cope with cpu hotplug -- detected during /proc/interrupts parsing */
--		if (need_cpu_rescan) {
--			need_cpu_rescan = 0;
-+		if (need_rescan) {
-+			need_rescan = 0;
- 			/* if there's a hotplug event we better turn off power mode for a bit until things settle */
- 			power_mode = 0;
- 			if (debug_mode)
-@@ -282,5 +353,10 @@ int main(int argc, char** argv)
- 
- 	}
- 	free_object_tree();
-+
-+	/* Remove pidfile */
-+	if (!foreground_mode && pidfile)
-+		unlink(pidfile);
-+
- 	return EXIT_SUCCESS;
- }
-diff --git a/irqbalance.h b/irqbalance.h
-index 4e85325..e46f31f 100644
---- a/irqbalance.h
-+++ b/irqbalance.h
-@@ -9,6 +9,7 @@
- #include <stdint.h>
- #include <glib.h>
- #include <syslog.h>
-+#include <limits.h>
- 
- #include "types.h"
- #ifdef HAVE_NUMA_H
-@@ -40,7 +41,6 @@ void dump_tree(void);
- 
- void activate_mappings(void);
- void account_for_nic_stats(void);
--void check_power_mode(void);
- void clear_cpu_tree(void);
- void pci_numa_scan(void);
- 
-@@ -64,10 +64,11 @@ enum hp_e {
- extern int debug_mode;
- extern int one_shot_mode;
- extern int power_mode;
--extern int need_cpu_rescan;
-+extern int need_rescan;
- extern enum hp_e hint_policy;
- extern unsigned long long cycle_count;
- extern unsigned long power_thresh;
-+extern char *banscript;
- 
- /*
-  * Numa node access routines
-@@ -103,10 +104,11 @@ extern int get_cpu_count(void);
-  */
- extern void rebuild_irq_db(void);
- extern void free_irq_db(void);
-+extern void add_banned_irq(int irq);
- extern void for_each_irq(GList *list, void (*cb)(struct irq_info *info,  void *data), void *data);
- extern struct irq_info *get_irq_info(int irq);
- extern void migrate_irq(GList **from, GList **to, struct irq_info *info);
--extern struct irq_info *add_misc_irq(int irq);
-+extern struct irq_info *add_new_irq(int irq);
- #define irq_numa_node(irq) ((irq)->numa_node)
- 
- 
-diff --git a/irqlist.c b/irqlist.c
-index c29ee84..2523173 100644
---- a/irqlist.c
-+++ b/irqlist.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -45,6 +46,7 @@ struct load_balance_info {
- 	unsigned int num_within;
- 	unsigned int num_over;
- 	unsigned int num_under;
-+	unsigned int num_powersave;
- 	struct topo_obj *powersave;
- };
- 
-@@ -106,13 +108,16 @@ static void migrate_overloaded_irqs(struct topo_obj *obj, void *data)
- 	struct load_balance_info *info = data;
- 	int deviation;
- 
-+	if (obj->powersave_mode)
-+		info->num_powersave++;
-+
- 	/*
-  	 * Don't rebalance irqs on objects whos load is below the average
-  	 */
- 	if (obj->load <= info->avg_load) {
- 		if ((obj->load + info->std_deviation) <= info->avg_load) {
- 			info->num_under++;
--			if (!info->powersave)
-+			if (power_thresh != ULONG_MAX && !info->powersave)
- 				if (!obj->powersave_mode)
- 					info->powersave = obj;
- 		} else
-@@ -172,13 +177,13 @@ void update_migration_status(void)
- {
- 	struct load_balance_info info;
- 	find_overloaded_objs(cpus, info);
--	if (cycle_count > 5) {
-+	if (power_thresh != ULONG_MAX && cycle_count > 5) {
- 		if (!info.num_over && (info.num_under >= power_thresh) && info.powersave) {
- 			syslog(LOG_INFO, "cpu %d entering powersave mode\n", info.powersave->number);
- 			info.powersave->powersave_mode = 1;
- 			if (g_list_length(info.powersave->interrupts) > 0)
- 				for_each_irq(info.powersave->interrupts, force_irq_migration, NULL);
--		} else if (info.num_over) {
-+		} else if ((info.num_over) && (info.num_powersave)) {
- 			syslog(LOG_INFO, "Load average increasing, re-enabling all cpus for irq balancing\n");
- 			for_each_object(cpus, clear_powersave_mode, NULL);
- 		}
-diff --git a/m4/cap-ng.m4 b/m4/cap-ng.m4
-deleted file mode 100644
-index 0024edc..0000000
---- a/m4/cap-ng.m4
-+++ /dev/null
-@@ -1,40 +0,0 @@
--# libcap-ng.m4 - Checks for the libcap-ng support
--# 	Copyright (c) 2009 Steve Grubb sgrubb@redhat.com
--#
--AC_DEFUN([LIBCAP_NG_PATH],
--[
--  AC_ARG_WITH(libcap-ng,
--    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
--    with_libcap_ng=auto)
--
--  # Check for Libcap-ng API
--  #
--  # libcap-ng detection
--
--  if test x$with_libcap_ng = xno ; then
--      have_libcap_ng=no;
--  else
--      # Start by checking for header file
--      AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
--
--      # See if we have libcap-ng library
--      AC_CHECK_LIB(cap-ng, capng_clear,
--	         CAPNG_LDADD=-lcap-ng,)
--
--      # Check results are usable
--      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
--         AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
--      fi
--      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
--         AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
--      fi
--  fi
--  AC_SUBST(CAPNG_LDADD)
--  AC_MSG_CHECKING(whether to use libcap-ng)
--  if test x$CAPNG_LDADD != x ; then
--      AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
--      AC_MSG_RESULT(yes)
--  else
--      AC_MSG_RESULT(no)
--  fi
--])
-diff --git a/misc/irqbalance.env b/misc/irqbalance.env
-new file mode 100644
-index 0000000..bd87e3d
---- /dev/null
-+++ b/misc/irqbalance.env
-@@ -0,0 +1,26 @@
-+# irqbalance is a daemon process that distributes interrupts across
-+# CPUS on SMP systems.  The default is to rebalance once every 10
-+# seconds.  This is the environment file that is specified to systemd via the 
-+# EnvironmentFile key in the service unit file (or via whatever method the init
-+# system you're using has. 
-+#
-+# ONESHOT=yes
-+#    after starting, wait for a minute, then look at the interrupt
-+#    load and balance it once; after balancing exit and do not change
-+#    it again.
-+#IRQBALANCE_ONESHOT=
-+
-+#
-+# IRQBALANCE_BANNED_CPUS
-+#    64 bit bitmask which allows you to indicate which cpu's should
-+#    be skipped when reblancing irqs.  Cpu numbers which have their 
-+#    corresponding bits set to one in this mask will not have any
-+#    irq's assigned to them on rebalance
-+#
-+#IRQBALANCE_BANNED_CPUS=
-+
-+#
-+# IRQBALANCE_ARGS
-+#    append any args here to the irqbalance daemon as documented in the man page
-+#
-+#IRQBALANCE_ARGS=
-diff --git a/misc/irqbalance.service b/misc/irqbalance.service
-index f349616..3139a83 100644
---- a/misc/irqbalance.service
-+++ b/misc/irqbalance.service
-@@ -3,9 +3,8 @@ Description=irqbalance daemon
- After=syslog.target
- 
- [Service]
--EnvironmentFile=/etc/sysconfig/irqbalance
--Type=forking
--ExecStart=/usr/sbin/irqbalance $ONESHOT
-+EnvironmentFile=/path/to/irqbalance.env
-+ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS
- 
- [Install]
- WantedBy=multi-user.target
-diff --git a/numa.c b/numa.c
-index 710ed67..96703bd 100644
---- a/numa.c
-+++ b/numa.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -106,11 +107,11 @@ void build_numa_node_list(void)
- static void free_numa_node(gpointer data)
- {
- 	struct topo_obj *obj = data;
--	if (data == &unspecified_node)
--		return;
--
- 	g_list_free(obj->children);
--	free(data);
-+	g_list_free(obj->interrupts);
-+
-+	if (data != &unspecified_node)
-+		free(data);
- }
- 
- void free_numa_node_list(void)
-diff --git a/placement.c b/placement.c
-index 108ccc9..1172849 100644
---- a/placement.c
-+++ b/placement.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhoramn@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -48,7 +49,7 @@ static void find_best_object(struct topo_obj *d, void *data)
- 	/*
-  	 * Don't consider the unspecified numa node here
-  	 */
--	if ((d->obj_type == OBJ_TYPE_NODE) && (d->number == -1))
-+	if (numa_avail && (d->obj_type == OBJ_TYPE_NODE) && (d->number == -1))
- 		return;
- 
- 	/*
-diff --git a/powermode.c b/powermode.c
-deleted file mode 100644
-index 82ba490..0000000
---- a/powermode.c
-+++ /dev/null
-@@ -1,34 +0,0 @@
--/* 
-- * Copyright (C) 2006, Intel Corporation
-- * 
-- * This file is part of irqbalance
-- *
-- * This program file 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; version 2 of the License.
-- * 
-- * This program is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-- * for more details.
-- * 
-- * You should have received a copy of the GNU General Public License
-- * along with this program in a file named COPYING; if not, write to the 
-- * Free Software Foundation, Inc., 
-- * 51 Franklin Street, Fifth Floor, 
-- * Boston, MA 02110-1301 USA
-- */
--#include "config.h"
--#include <stdio.h>
--#include <stdlib.h>
--#include <unistd.h>
--#include <stdint.h>
--#include <string.h>
--
--#include "irqbalance.h"
--
--
--void check_power_mode(void)
--{
--}
--
-diff --git a/procinterrupts.c b/procinterrupts.c
-index 4d3b07b..431fffa 100644
---- a/procinterrupts.c
-+++ b/procinterrupts.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -32,6 +33,8 @@
- 
- #define LINESIZE 4096
- 
-+extern cpumask_t banned_cpus;
-+
- static int proc_int_has_msi = 0;
- static int msi_found_in_sysfs = 0;
- 
-@@ -80,8 +83,12 @@ void parse_proc_interrupts(void)
- 		c++;
- 		number = strtoul(line, NULL, 10);
- 		info = get_irq_info(number);
--		if (!info)
--			info = add_misc_irq(number);
-+		if (!info) {
-+			if (!cycle_count)
-+				continue;
-+			need_rescan = 1;
-+			info = add_new_irq(number);
-+		}
- 
- 		count = 0;
- 		cpunr = 0;
-@@ -97,7 +104,7 @@ void parse_proc_interrupts(void)
- 			cpunr++;
- 		}
- 		if (cpunr != core_count) 
--			need_cpu_rescan = 1;
-+			need_rescan = 1;
- 
- 		info->last_irq_count = info->irq_count;		
- 		info->irq_count = count;
-@@ -217,6 +224,9 @@ void parse_proc_stat(void)
- 
- 		cpunr = strtoul(&line[3], NULL, 10);
- 
-+		if (cpu_isset(cpunr, banned_cpus))
-+			continue;
-+
- 		rc = sscanf(line, "%*s %*d %*d %*d %*d %*d %d %d", &irq_load, &softirq_load);
- 		if (rc < 2)
- 			break;	
diff --git a/testing/irqbalance/irqbalance.conf.d b/testing/irqbalance/irqbalance.conf.d
deleted file mode 100644
index ef1bdfd75..000000000
--- a/testing/irqbalance/irqbalance.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Settings for irqbalance daemon
-#
-
-# one shot mode - set to 1 if you have Pentium 4 with HT
-ONESHOT=0
diff --git a/testing/irqbalance/irqbalance.rc.d b/testing/irqbalance/irqbalance.rc.d
deleted file mode 100644
index 987c26b51..000000000
--- a/testing/irqbalance/irqbalance.rc.d
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-ONESHOT=0
-[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance
-
-if [ "$ONESHOT" -ne 0 ]; then
-	ONESHOT_CMD="--oneshot"
-fi
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/irqbalance`
-case "$1" in
-  start)
-    stat_busy "Starting IRQ balancing"
-    [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      if [ "$ONESHOT" -eq 0 ]; then
-        add_daemon irqbalance
-      fi
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IRQ balancing"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irqbalance
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/irqbalance/irqbalance.service b/testing/irqbalance/irqbalance.service
deleted file mode 100644
index 372ac0aa4..000000000
--- a/testing/irqbalance/irqbalance.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CPU Interrupt Request Balancer
-
-[Service]
-ExecStart=/usr/sbin/irqbalance --foreground
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD
deleted file mode 100644
index 5eeac9eec..000000000
--- a/testing/isl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161919 2012-06-16 14:55:37Z heftig $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=isl
-pkgver=0.10
-pkgrel=1
-pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
-arch=('i686' 'x86_64')
-url="http://www.kotnet.org/~skimo/isl/"
-license=('LGPL2.1')
-options=('!libtool')
-source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('c1ece653891bb2a5f55ca25e3f4e8f35')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 DESTDIR="$pkgdir/" install
-
-  install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/
-  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.0.0-gdb.py
-}
diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD
deleted file mode 100644
index 1e7cbe073..000000000
--- a/testing/iw/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 165785 2012-08-29 23:06:26Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=iw
-pkgver=3.6
-pkgrel=1
-pkgdesc="nl80211 based CLI configuration utility for wireless devices"
-arch=("i686" "x86_64")
-url="http://wireless.kernel.org/en/users/Documentation/iw"
-license=("GPL")
-depends=("libnl")
-makedepends=("linux-api-headers")
-source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/jack/40-hpet-permissions.rules b/testing/jack/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9..000000000
--- a/testing/jack/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/testing/jack/99-audio.conf b/testing/jack/99-audio.conf
deleted file mode 100644
index eb76ef920..000000000
--- a/testing/jack/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/testing/jack/PKGBUILD b/testing/jack/PKGBUILD
deleted file mode 100644
index 185e4d02f..000000000
--- a/testing/jack/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 167217 2012-09-28 14:43:50Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@archlinux.net>
-# Contributor: Robert Emil Berge <robert@rebi.no>
-
-pkgname=jack
-_longname=jack-audio-connection-kit
-pkgver=0.121.3
-pkgrel=7
-pkgdesc="A low-latency audio server"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('libsamplerate' 'readline')
-makedepends=('doxygen' 'libffado' 'celt')
-optdepends=('libffado: FireWire support'
-            'celt: NetJACK driver')
-url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-audio.conf)
-options=('!libtool')
-provides=("$_longname=$pkgver")
-conflicts=("$_longname")
-replaces=("$_longname")
-install=$pkgname.install
-source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
-        '99-audio.conf'
-        '40-hpet-permissions.rules'
-        'ffado_setbuffsize-jack1.patch')
-md5sums=('35f470f7422c37b33eb965033f7a42e8'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef'
-         'c1f78ee7847c6d5e471d90626623ffb4')
-
-build() {
-  cd "$srcdir/$_longname-$pkgver"
-
-  # backport firewire stuff
-  #   - needed for setbuffsize feature in latest stable ffado
-  # from https://github.com/jackaudio/jack1/commit/025d3ad
-  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack1.patch"
-
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$_longname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # configure realtime access/scheduling
-  # see https://bugs.archlinux.org/task/26343
-  install -Dm644 "$srcdir/99-audio.conf" \
-    "$pkgdir/etc/security/limits.d/99-audio.conf"
-
-  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
-    "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  # install a missing header forgotten by upstream
-  # see https://bugs.archlinux.org/task/26865
-  install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \
-    "$pkgdir/usr/include/jack/jslist.h"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/jack/ffado_setbuffsize-jack1.patch b/testing/jack/ffado_setbuffsize-jack1.patch
deleted file mode 100644
index 7e43962ee..000000000
--- a/testing/jack/ffado_setbuffsize-jack1.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 025d3ad4d5adeff00e97b6fafdf32d6d199d0baa Mon Sep 17 00:00:00 2001
-From: Jonathan Woithe <jwoithe@just42.net>
-Date: Tue, 13 Mar 2012 15:43:03 +1030
-Subject: [PATCH] Support setbufsize in firewire driver
-
----
- drivers/firewire/ffado_driver.c |   69 ++++++++++++++++++++++++++++++++++-----
- 1 file changed, 60 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/firewire/ffado_driver.c b/drivers/firewire/ffado_driver.c
-index a8ad1ea..6035af3 100644
---- a/drivers/firewire/ffado_driver.c
-+++ b/drivers/firewire/ffado_driver.c
-@@ -7,6 +7,7 @@
-  *   http://www.jackaudio.org
-  *
-  *   Copyright (C) 2005-2007 Pieter Palmers
-+ *   Copyright (C) 2012 Jonathan Woithe
-  *
-  *   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
-@@ -50,7 +51,10 @@
- 
- static int ffado_driver_stop (ffado_driver_t *driver);
- 
-+// Basic functionality requires API version 8.  If version 9 or later
-+// is present the buffers can be resized at runtime.
- #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
-+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
- 
- // enable verbose messages
- static int g_verbose=0;
-@@ -675,24 +679,71 @@
- static int
- ffado_driver_bufsize (ffado_driver_t* driver, jack_nframes_t nframes)
- {
--	printError("Buffer size change requested but not supported!!!");
-+	signed int chn;
-+
-+	// The speed of this function isn't critical; we can afford the
-+	// time to check the FFADO API version.
-+	if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
-+            ffado_streaming_set_period_size == NULL) {
-+	        printError("unsupported on current version of FFADO; please upgrade FFADO");
-+	        return -1;
-+	}
- 
--	/*
--	 driver->period_size = nframes;  
-+	driver->period_size = nframes;
- 	driver->period_usecs =
- 		(jack_time_t) floor ((((float) nframes) / driver->sample_rate)
- 				     * 1000000.0f);
--	*/
--	
-+
-+	// Reallocate the null and scratch buffers.
-+	driver->nullbuffer = calloc(driver->period_size, sizeof(ffado_sample_t));
-+	if(driver->nullbuffer == NULL) {
-+		printError("could not allocate memory for null buffer");
-+		return -1;
-+	}
-+	driver->scratchbuffer = calloc(driver->period_size, sizeof(ffado_sample_t));
-+	if(driver->scratchbuffer == NULL) {
-+		printError("could not allocate memory for scratch buffer");
-+		return -1;
-+	}
-+
-+	// MIDI buffers need reallocating
-+	for (chn = 0; chn < driver->capture_nchannels; chn++) {
-+		if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-+			// setup the midi buffer
-+			if (driver->capture_channels[chn].midi_buffer != NULL)
-+			        free(driver->capture_channels[chn].midi_buffer);
-+			driver->capture_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t));
-+		}
-+	}
-+	for (chn = 0; chn < driver->playback_nchannels; chn++) {
-+		if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-+		        if (driver->playback_channels[chn].midi_buffer != NULL)
-+		                free(driver->playback_channels[chn].midi_buffer);
-+			driver->playback_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t));
-+		}
-+	}
-+
-+	// Notify FFADO of the period size change
-+	if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
-+	        printError("could not alter FFADO device period size");
-+	        return -1;
-+	}
-+
-+	// This is needed to give the shadow variables a chance to
-+	// properly update to the changes.
-+	sleep(1);
-+
- 	/* tell the engine to change its buffer size */
--#if 0
- 	if (driver->engine->set_buffer_size (driver->engine, nframes)) {
- 		jack_error ("FFADO: cannot set engine buffer size to %d (check MIDI)", nframes);
- 		return -1;
- 	}
--#endif
- 
--	return -1; // unsupported
-+	// Other drivers (eg: ALSA) don't seem to adjust latencies via
-+	// jack_port_set_latency_range() from the bufsize() callback, so we
-+	// won't either.  Is this right?
-+
-+        return 0;
- }
- 
- typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-@@ -704,7 +755,7 @@
- {
- 	ffado_driver_t *driver;
- 
--	if(ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-+	if(ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
- 		printError("Incompatible libffado version! (%s)", ffado_get_version());
- 		return NULL;
- 	}
--- 
-1.7.10
-
diff --git a/testing/jack/jack.install b/testing/jack/jack.install
deleted file mode 100644
index 8be532f6d..000000000
--- a/testing/jack/jack.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-	rm -f etc/security/limits.d/99-realtime.conf
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/jasper/PKGBUILD b/testing/jasper/PKGBUILD
deleted file mode 100644
index dc7b9662c..000000000
--- a/testing/jasper/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168284 2012-10-07 21:09:20Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=jasper
-pkgver=1.900.1
-pkgrel=8
-pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
-arch=('i686' 'x86_64')
-url="http://www.ece.uvic.ca/~mdadams/jasper/"
-license=('custom:JasPer2.0')
-depends=('libjpeg' 'freeglut' 'libxmu' 'glu')
-options=('!libtool')
-source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch
-        patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch
-        jasper-1.900.1-CVE-2008-3522.patch)
-sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191'
-          'c1a0176a15210c0af14d85e55ce566921957d780'
-          'f298566fef08c8a589d072582112cd51c72c3983'
-          '2483dba925670bf29f531d85d73c4e5ada513b01'
-          '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/jpc_dec.c.patch"
-  patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff"
-  patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch"
-  patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch"
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch b/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch
deleted file mode 100644
index 0f5e3b746..000000000
--- a/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch
+++ /dev/null
@@ -1,928 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
-
-OpenBSD jas_malloc hardening patches
-
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
-@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
- {
- 	jas_cmpxform_t **p;
- 	assert(n >= pxformseq->numpxforms);
--	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
--	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
-+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
- 	if (!p) {
- 		return -1;
- 	}
-@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
- 	jas_cmshapmatlut_cleanup(lut);
- 	if (curv->numents == 0) {
- 		lut->size = 2;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		lut->data[0] = 0.0;
- 		lut->data[1] = 1.0;
- 	} else if (curv->numents == 1) {
- 		lut->size = 256;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		gamma = curv->ents[0] / 256.0;
- 		for (i = 0; i < lut->size; ++i) {
-@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
- 		}
- 	} else {
- 		lut->size = curv->numents;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		for (i = 0; i < lut->size; ++i) {
- 			lut->data[i] = curv->ents[i] / 65535.0;
-@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
- 			return -1;
- 		}
- 	}
--	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
-+	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
- 		return -1;
- 	invlut->size = n;
- 	for (i = 0; i < invlut->size; ++i) {
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
- 	jas_icctagtab_t *tagtab;
- 
- 	tagtab = &prof->tagtab;
--	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
-+	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
- 	  sizeof(jas_icctagtabent_t))))
- 		goto error;
- 	tagtab->numents = prof->attrtab->numattrs;
-@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
- 	}
- 	if (jas_iccgetuint32(in, &tagtab->numents))
- 		goto error;
--	if (!(tagtab->ents = jas_malloc(tagtab->numents *
-+	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
- 	  sizeof(jas_icctagtabent_t))))
- 		goto error;
- 	tagtabent = tagtab->ents;
-@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
- {
- 	jas_iccattr_t *newattrs;
- 	assert(maxents >= tab->numattrs);
--	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
--	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
-+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
- 	if (!newattrs)
- 		return -1;
- 	tab->attrs = newattrs;
-@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
- 
- 	if (jas_iccgetuint32(in, &curv->numents))
- 		goto error;
--	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
-+	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
- 		goto error;
- 	for (i = 0; i < curv->numents; ++i) {
- 		if (jas_iccgetuint16(in, &curv->ents[i]))
-@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
- 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
- 	  jas_iccgetuint32(in, &txtdesc->uclen))
- 		goto error;
--	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
-+	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
- 		goto error;
- 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
- 	  JAS_CAST(int, txtdesc->uclen * 2))
-@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
- 	  jas_iccgetuint16(in, &lut8->numouttabents))
- 		goto error;
- 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
--	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
--	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->intabs = jas_malloc(lut8->numinchans *
-+	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
-+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
- 	  sizeof(jas_iccuint8_t *))))
- 		goto error;
- 	for (i = 0; i < lut8->numinchans; ++i)
- 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
--	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
--	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
-+	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
-+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
- 	  sizeof(jas_iccuint8_t *))))
- 		goto error;
- 	for (i = 0; i < lut8->numoutchans; ++i)
-@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
- 	  jas_iccgetuint16(in, &lut16->numouttabents))
- 		goto error;
- 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
--	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
--	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->intabs = jas_malloc(lut16->numinchans *
-+	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
-+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
- 	  sizeof(jas_iccuint16_t *))))
- 		goto error;
- 	for (i = 0; i < lut16->numinchans; ++i)
- 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
--	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
--	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
-+	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
-+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
- 	  sizeof(jas_iccuint16_t *))))
- 		goto error;
- 	for (i = 0; i < lut16->numoutchans; ++i)
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
-@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
- 	image->inmem_ = true;
- 
- 	/* Allocate memory for the per-component information. */
--	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
-+	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
- 	  sizeof(jas_image_cmpt_t *)))) {
- 		jas_image_destroy(image);
- 		return 0;
-@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
- 	jas_image_cmpt_t **newcmpts;
- 	int cmptno;
- 
--	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
--	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
-+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
- 	if (!newcmpts) {
- 		return -1;
- 	}
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -76,6 +76,9 @@
- 
- /* We need the prototype for memset. */
- #include <string.h>
-+#include <limits.h>
-+#include <errno.h>
-+#include <stdint.h>
- 
- #include "jasper/jas_malloc.h"
- 
-@@ -113,18 +116,50 @@ void jas_free(void *ptr)
- 
- void *jas_realloc(void *ptr, size_t size)
- {
--	return realloc(ptr, size);
-+	return ptr ? realloc(ptr, size) : malloc(size);
- }
- 
--void *jas_calloc(size_t nmemb, size_t size)
-+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
-+{
-+	if (!ptr)
-+		return jas_alloc2(nmemb, size);
-+	if (nmemb && SIZE_MAX / nmemb < size) {
-+		errno = ENOMEM;
-+		return NULL;
-+	}
-+	return jas_realloc(ptr, nmemb * size);
-+
-+}
-+
-+void *jas_alloc2(size_t nmemb, size_t size)
-+{
-+	if (nmemb && SIZE_MAX / nmemb < size) {
-+		errno = ENOMEM;
-+		return NULL;
-+	}
-+
-+	return jas_malloc(nmemb * size);
-+}
-+
-+void *jas_alloc3(size_t a, size_t b, size_t c)
- {
--	void *ptr;
- 	size_t n;
--	n = nmemb * size;
--	if (!(ptr = jas_malloc(n * sizeof(char)))) {
--		return 0;
-+
-+	if (a && SIZE_MAX / a < b) {
-+		errno = ENOMEM;
-+		return NULL;
- 	}
--	memset(ptr, 0, n);
-+
-+	return jas_alloc2(a*b, c);
-+}
-+
-+void *jas_calloc(size_t nmemb, size_t size)
-+{
-+	void *ptr;
-+
-+	ptr = jas_alloc2(nmemb, size);
-+	if (ptr)
-+		memset(ptr, 0, nmemb*size);
- 	return ptr;
- }
- 
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
-@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
- 	matrix->datasize_ = numrows * numcols;
- 
- 	if (matrix->maxrows_ > 0) {
--		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
-+		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
- 		  sizeof(jas_seqent_t *)))) {
- 			jas_matrix_destroy(matrix);
- 			return 0;
-@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
- 	}
- 
- 	if (matrix->datasize_ > 0) {
--		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
-+		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
- 		  sizeof(jas_seqent_t)))) {
- 			jas_matrix_destroy(matrix);
- 			return 0;
-@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
- 	mat0->numrows_ = r1 - r0 + 1;
- 	mat0->numcols_ = c1 - c0 + 1;
- 	mat0->maxrows_ = mat0->numrows_;
--	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
-+	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
- 	for (i = 0; i < mat0->numrows_; ++i) {
- 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
- 	}
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
-@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
- 	if (buf) {
- 		obj->buf_ = (unsigned char *) buf;
- 	} else {
--		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
-+		obj->buf_ = jas_malloc(obj->bufsize_);
- 		obj->myalloc_ = 1;
- 	}
- 	if (!obj->buf_) {
-@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
- 	unsigned char *buf;
- 
- 	assert(m->buf_);
--	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
-+	if (!(buf = jas_realloc(m->buf_, bufsize))) {
- 		return -1;
- 	}
- 	m->buf_ = buf;
-diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
---- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
-@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
- 	}
- 
- 	if (info->numcolors > 0) {
--		if (!(info->palents = jas_malloc(info->numcolors *
-+		if (!(info->palents = jas_alloc2(info->numcolors,
- 		  sizeof(bmp_palent_t)))) {
- 			bmp_info_destroy(info);
- 			return 0;
-diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
---- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
-@@ -95,6 +95,9 @@ extern "C" {
- #define	jas_free	MEMFREE
- #define	jas_realloc	MEMREALLOC
- #define	jas_calloc	MEMCALLOC
-+#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
-+#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
-+#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
- #endif
- 
- /******************************************************************************\
-@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
- /* Allocate a block of memory and initialize the contents to zero. */
- void *jas_calloc(size_t nmemb, size_t size);
- 
-+/* size-checked double allocation .*/
-+void *jas_alloc2(size_t, size_t);
-+
-+void *jas_alloc3(size_t, size_t, size_t);
-+
-+void *jas_realloc2(void *, size_t, size_t);
- #endif
- 
- #ifdef __cplusplus
-diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
-@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
- 	box = 0;
- 	tmpstream = 0;
- 
--	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
-+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
- 		goto error;
- 	}
- 	box->ops = &jp2_boxinfo_unk.ops;
-@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
- 	jp2_bpcc_t *bpcc = &box->data.bpcc;
- 	unsigned int i;
- 	bpcc->numcmpts = box->datalen;
--	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
-+	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < bpcc->numcmpts; ++i) {
-@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
- 		break;
- 	case JP2_COLR_ICC:
- 		colr->iccplen = box->datalen - 3;
--		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
-+		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
- 			return -1;
- 		}
- 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
-@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
- 	if (jp2_getuint16(in, &cdef->numchans)) {
- 		return -1;
- 	}
--	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
-+	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
- 		return -1;
- 	}
- 	for (channo = 0; channo < cdef->numchans; ++channo) {
-@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
- 	unsigned int i;
- 
- 	cmap->numchans = (box->datalen) / 4;
--	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
-+	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < cmap->numchans; ++i) {
-@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
- 		return -1;
- 	}
- 	lutsize = pclr->numlutents * pclr->numchans;
--	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
-+	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
- 		return -1;
- 	}
--	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
-+	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < pclr->numchans; ++i) {
-diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
-@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
- 	}
- 
- 	/* Allocate space for the channel-number to component-number LUT. */
--	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
-+	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
- 		jas_eprintf("error: no memory\n");
- 		goto error;
- 	}
-@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
- 			if (cmapent->map == JP2_CMAP_DIRECT) {
- 				dec->chantocmptlut[channo] = channo;
- 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
--				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
-+				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
- 				for (i = 0; i < pclrd->numlutents; ++i) {
- 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
- 				}
-diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -191,7 +191,7 @@ int sgnd;
- 		}
- 		bpcc = &box->data.bpcc;
- 		bpcc->numcmpts = jas_image_numcmpts(image);
--		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
-+		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
- 		  sizeof(uint_fast8_t)))) {
- 			goto error;
- 		}
-@@ -285,7 +285,7 @@ int sgnd;
- 		}
- 		cdef = &box->data.cdef;
- 		cdef->numchans = jas_image_numcmpts(image);
--		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
-+		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
- 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
- 			cdefchanent = &cdef->ents[i];
- 			cdefchanent->channo = i;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
-@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
- 	  !siz->tileheight || !siz->numcomps) {
- 		return -1;
- 	}
--	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
-+	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < siz->numcomps; ++i) {
-@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
- 		jpc_qcx_destroycompparms(compparms);
-                 return -1;
-         } else if (compparms->numstepsizes > 0) {
--		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
-+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
- 		  sizeof(uint_fast16_t));
- 		assert(compparms->stepsizes);
- 		for (i = 0; i < compparms->numstepsizes; ++i) {
-@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
- 
- 	ppm->len = ms->len - 1;
- 	if (ppm->len > 0) {
--		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
-+		if (!(ppm->data = jas_malloc(ppm->len))) {
- 			goto error;
- 		}
- 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
-@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
- 	}
- 	ppt->len = ms->len - 1;
- 	if (ppt->len > 0) {
--		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
-+		if (!(ppt->data = jas_malloc(ppt->len))) {
- 			goto error;
- 		}
- 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
-@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
- 	uint_fast8_t tmp;
- 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
- 	  (ms->len / 7);
--	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
-+	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
- 		goto error;
- 	}
- 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
-@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
- 	jpc_crgcomp_t *comp;
- 	uint_fast16_t compno;
- 	crg->numcomps = cstate->numcomps;
--	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
-+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
- 		return -1;
- 	}
- 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
-@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
- 	cstate = 0;
- 
- 	if (ms->len > 0) {
--		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
-+		if (!(unk->data = jas_malloc(ms->len))) {
- 			return -1;
- 		}
- 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
-@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
- 
- 	if (dec->state == JPC_MH) {
- 
--		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
-+		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
- 		assert(compinfos);
- 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
- 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
-@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
- 			tile->realmode = 1;
- 		}
- 		tcomp->numrlvls = ccp->numrlvls;
--		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
-+		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
- 		  sizeof(jpc_dec_rlvl_t)))) {
- 			return -1;
- 		}
-@@ -764,7 +764,7 @@ rlvl->bands = 0;
- 			  rlvl->cbgheightexpn);
- 
- 			rlvl->numbands = (!rlvlno) ? 1 : 3;
--			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
-+			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
- 			  sizeof(jpc_dec_band_t)))) {
- 				return -1;
- 			}
-@@ -797,7 +797,7 @@ rlvl->bands = 0;
- 
- 				assert(rlvl->numprcs);
- 
--				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
-+				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
- 					return -1;
- 				}
- 
-@@ -834,7 +834,7 @@ rlvl->bands = 0;
- 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
- 				return -1;
- 			}
--			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
-+			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
- 				return -1;
- 			}
- 
-@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
- 		return -1;
- 	}
- 
--	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
-+	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
- 		return -1;
- 	}
- 
-@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
- 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
- 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
- 	dec->numtiles = dec->numhtiles * dec->numvtiles;
--	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
-+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
- 		return -1;
- 	}
- 
-@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
- 		tile->pkthdrstreampos = 0;
- 		tile->pptstab = 0;
- 		tile->cp = 0;
--		if (!(tile->tcomps = jas_malloc(dec->numcomps *
-+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
- 		  sizeof(jpc_dec_tcomp_t)))) {
- 			return -1;
- 		}
-@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
- 	cp->numlyrs = 0;
- 	cp->mctid = 0;
- 	cp->csty = 0;
--	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
-+	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
- 		return 0;
- 	}
- 	if (!(cp->pchglist = jpc_pchglist_create())) {
-@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
- 	}
- 	streamlist->numstreams = 0;
- 	streamlist->maxstreams = 100;
--	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
-+	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
- 	  sizeof(jas_stream_t *)))) {
- 		jas_free(streamlist);
- 		return 0;
-@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
- 	/* Grow the array of streams if necessary. */
- 	if (streamlist->numstreams >= streamlist->maxstreams) {
- 		newmaxstreams = streamlist->maxstreams + 1024;
--		if (!(newstreams = jas_realloc(streamlist->streams,
--		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
-+		if (!(newstreams = jas_realloc2(streamlist->streams,
-+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
- 			return -1;
- 		}
- 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
-@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
- {
- 	jpc_ppxstabent_t **newents;
- 	if (tab->maxents < maxents) {
--		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
--		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
-+		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
- 		if (!newents) {
- 			return -1;
- 		}
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
- 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
- 	}
- 
--	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
-+	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
- 		goto error;
- 	}
- 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
-@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
- 
- 	if (ilyrrates && numilyrrates > 0) {
- 		tcp->numlyrs = numilyrrates + 1;
--		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
-+		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
- 		  sizeof(jpc_fix_t)))) {
- 			goto error;
- 		}
-@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
- 	siz->tilewidth = cp->tilewidth;
- 	siz->tileheight = cp->tileheight;
- 	siz->numcomps = cp->numcmpts;
--	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
-+	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
- 	assert(siz->comps);
- 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
- 		siz->comps[i].prec = cp->ccps[i].prec;
-@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
- 		return -1;
- 	}
- 	crg = &enc->mrk->parms.crg;
--	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
-+	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
- 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
- 		jas_eprintf("cannot write CRG marker\n");
- 		return -1;
-@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
- 	tile->mctid = cp->tcp.mctid;
- 
- 	tile->numlyrs = cp->tcp.numlyrs;
--	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
-+	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
- 	  sizeof(uint_fast32_t)))) {
- 		goto error;
- 	}
-@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
- 	}
- 
- 	/* Allocate an array for the per-tile-component information. */
--	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
-+	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
- 		goto error;
- 	}
- 	/* Initialize a few members critical for error recovery. */
-@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
- 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
- 	  jas_seq2d_yend(tcmpt->data), bandinfos);
- 
--	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
-+	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
- 		goto error;
- 	}
- 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
- 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
- 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
- 
--	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
-+	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
- 		goto error;
- 	}
- 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
- 	band->synweight = bandinfo->synenergywt;
- 
- if (band->data) {
--	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
-+	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
- 		goto error;
- 	}
- 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
-@@ -2422,7 +2422,7 @@ if (!rlvlno) {
- 			goto error;
- 		}
- 
--		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
-+		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
- 			goto error;
- 		}
- 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
-@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
- 	mqdec->in = in;
- 	mqdec->maxctxs = maxctxs;
- 	/* Allocate memory for the per-context state information. */
--	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
-+	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
- 		goto error;
- 	}
- 	/* Set the current context to the first context. */
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
- 	mqenc->maxctxs = maxctxs;
- 
- 	/* Allocate memory for the per-context state information. */
--	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
-+	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
- 		goto error;
- 	}
- 
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
-@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- #if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
-@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- #if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
-@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- #if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
-@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- #if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
-@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
- #if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
-@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
- #if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
-@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
- #if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
-@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
- #if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
- 
- 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
- 	if (cblk->numpasses > 0) {
--		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
-+		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
- 		assert(cblk->passes);
- 	} else {
- 		cblk->passes = 0;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
-@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
- 	}
- 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
- 		newmaxpchgs = pchglist->maxpchgs + 128;
--		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
-+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
- 			return -1;
- 		}
- 		pchglist->maxpchgs = newmaxpchgs;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
-@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
- 		return 0;
- 	}
- 	pi->numcomps = dec->numcomps;
--	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
-+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
- 		jpc_pi_destroy(pi);
- 		return 0;
- 	}
-@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
- 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
- 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
- 		picomp->numrlvls = tcomp->numrlvls;
--		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
-+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
- 		  sizeof(jpc_pirlvl_t)))) {
- 			jpc_pi_destroy(pi);
- 			return 0;
-@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
- 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
- /* XXX sizeof(long) should be sizeof different type */
- 			pirlvl->numprcs = rlvl->numprcs;
--			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
-+			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
- 			  sizeof(long)))) {
- 				jpc_pi_destroy(pi);
- 				return 0;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
- 	}
- 	pi->pktno = -1;
- 	pi->numcomps = cp->numcmpts;
--	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
-+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
- 		jpc_pi_destroy(pi);
- 		return 0;
- 	}
-@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
- 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
- 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
- 		picomp->numrlvls = tcomp->numrlvls;
--		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
-+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
- 		  sizeof(jpc_pirlvl_t)))) {
- 			jpc_pi_destroy(pi);
- 			return 0;
-@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
- /* XXX sizeof(long) should be sizeof different type */
- 			pirlvl->numprcs = rlvl->numprcs;
- 			if (rlvl->numprcs) {
--				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
-+				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
- 				  sizeof(long)))) {
- 					jpc_pi_destroy(pi);
- 					return 0;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
-@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
- 		++numlvls;
- 	} while (n > 1);
- 
--	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
-+	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
- 		return 0;
- 	}
- 
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
-@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
- 	}
- 
- 	if (n) {
--		if (!(vs = jas_malloc(n * sizeof(double)))) {
-+		if (!(vs = jas_alloc2(n, sizeof(double)))) {
- 			return -1;
- 		}
- 
-diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
---- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
-@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
- 	int cmptno;
- 	mif_cmpt_t **newcmpts;
- 	assert(maxcmpts >= hdr->numcmpts);
--	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
--	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
-+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
- 	if (!newcmpts) {
- 		return -1;
- 	}
diff --git a/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch b/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch
deleted file mode 100644
index 4bf2e9b52..000000000
--- a/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
-
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
-+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
-@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
- 	int ret;
- 
- 	va_start(ap, fmt);
--	ret = vsprintf(buf, fmt, ap);
-+	ret = vsnprintf(buf, sizeof buf, fmt, ap);
- 	jas_stream_puts(stream, buf);
- 	va_end(ap);
- 	return ret;
diff --git a/testing/jasper/jpc_dec.c.patch b/testing/jasper/jpc_dec.c.patch
deleted file mode 100644
index ae1cd0617..000000000
--- a/testing/jasper/jpc_dec.c.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
---- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
-+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
-@@ -1069,12 +1069,12 @@
- 	/* Apply an inverse intercomponent transform if necessary. */
- 	switch (tile->cp->mctid) {
- 	case JPC_MCT_RCT:
--		assert(dec->numcomps == 3);
-+		assert(dec->numcomps >= 3);
- 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
- 		  tile->tcomps[2].data);
- 		break;
- 	case JPC_MCT_ICT:
--		assert(dec->numcomps == 3);
-+		assert(dec->numcomps >= 3);
- 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
- 		  tile->tcomps[2].data);
- 		break;
diff --git a/testing/jasper/patch-libjasper-stepsizes-overflow.diff b/testing/jasper/patch-libjasper-stepsizes-overflow.diff
deleted file mode 100644
index 097559f68..000000000
--- a/testing/jasper/patch-libjasper-stepsizes-overflow.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2007-04-06 01:29:02.000000000 +0200
-@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc
- 		compparms->numstepsizes = (len - n) / 2;
- 		break;
- 	}
--	if (compparms->numstepsizes > 0) {
-+	if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
-+		jpc_qcx_destroycompparms(compparms);
-+                return -1;
-+        } else if (compparms->numstepsizes > 0) {
- 		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
- 		  sizeof(uint_fast16_t));
- 		assert(compparms->stepsizes);
diff --git a/testing/json-glib/PKGBUILD b/testing/json-glib/PKGBUILD
deleted file mode 100644
index b1229d31d..000000000
--- a/testing/json-glib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169184 2012-10-18 19:24:00Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=json-glib
-pkgver=0.15.2
-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.15/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde')
-
-build(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-
-check(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
diff --git a/testing/k3b/PKGBUILD b/testing/k3b/PKGBUILD
deleted file mode 100644
index d493a7da3..000000000
--- a/testing/k3b/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164631 2012-08-01 16:00:41Z andrea $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=k3b
-pkgver=2.0.2
-pkgrel=6
-pkgdesc="Feature-rich and easy to handle CD burning application"
-arch=('i686' 'x86_64')
-url="http://k3b.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'libsamplerate' 'libmad'
-         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft')
-makedepends=('cmake' 'automoc4' 'docbook-xml')
-optdepends=('dvd+rw-tools: for dvd burning support'
-            'vcdimager: for vcd burning support'
-            'transcode: for advanced mpeg conversion support'
-            'emovix: for bootable multimedia cd/dvd support'
-            'cdrdao: for disk-at-once (DAO) mode support')
-options=('!libtool')
-install=k3b.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch)
-sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
-          '8120c0e22e6c41ea285ca6060be13723ed91c52b'
-          '5b35bff3f7670686a32bd71afea2deaca4331631')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch"
-  patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch"
-  cd ..
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/k3b/k3b-2.0.2-ffmpeg.patch b/testing/k3b/k3b-2.0.2-ffmpeg.patch
deleted file mode 100644
index 2878b1edc..000000000
--- a/testing/k3b/k3b-2.0.2-ffmpeg.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-commit 61ca30beb978f68e72257408777c6433f33129bd
-Author: Michal Malek <michalm@jabster.pl>
-Date:   Sun Aug 28 20:18:53 2011 +0200
-
-    Fixed compilation with new FFMPEG
-    
-    BUG: 274817
-    FIXED-IN: 2.0.3
-
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-index 0ad59fc..0c5f366 100644
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
- #else
-     ::AVCodecContext* codecContext =  d->formatContext->streams[0]->codec;
- #endif
--    if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
-+    if( codecContext->codec_type != 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+        AVMEDIA_TYPE_AUDIO)
-+#else
-+        CODEC_TYPE_AUDIO)
-+#endif
-+    {
-         kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
-         return false;
-     }
-@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
- QString K3bFFMpegFile::title() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->title[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->title );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
- QString K3bFFMpegFile::author() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->author[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->author );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
- QString K3bFFMpegFile::comment() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->comment[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->comment );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
- #if LIBAVCODEC_VERSION_MAJOR < 52
-         int len = ::avcodec_decode_audio(
- #else
-+   #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+        int len = ::avcodec_decode_audio3(
-+   #else
-         int len = ::avcodec_decode_audio2(
-+   #endif
- #endif
-+
- #ifdef FFMPEG_BUILD_PRE_4629
-             &d->formatContext->streams[0]->codec,
- #else
-@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
- #endif
-             (short*)d->alignedOutputBuffer,
-             &d->outputBufferSize,
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            &d->packet );
-+#else
-             d->packetData, d->packetSize );
-+#endif
- 
-         if( d->packetSize <= 0 || len < 0 )
-             ::av_free_packet( &d->packet );
diff --git a/testing/k3b/k3b-2.0.2-libavformat54.patch b/testing/k3b/k3b-2.0.2-libavformat54.patch
deleted file mode 100644
index 174a776b8..000000000
--- a/testing/k3b/k3b-2.0.2-libavformat54.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-===================================================================
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
-     close();
- 
-     // open the file
--    int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
-+    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
-     if( err < 0 ) {
-         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
-         return false;
-@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
-     }
- 
-     // dump some debugging info
--    ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-+    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
- 
-     return true;
- }
diff --git a/testing/k3b/k3b.install b/testing/k3b/k3b.install
deleted file mode 100644
index 413ad60f7..000000000
--- a/testing/k3b/k3b.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-mime-database usr/share/mime  &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kactivities/PKGBUILD b/testing/kactivities/PKGBUILD
deleted file mode 100644
index 99274b055..000000000
--- a/testing/kactivities/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167564 2012-10-02 18:57:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kactivities
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='API for using and interacting with the Activity Manager'
-url='https://projects.kde.org/projects/kde/kdelibs/kactivities'
-license=('GPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('7e5ec2aa1492450ea1de40f9e110561f6221b5ca')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kbd/PKGBUILD b/testing/kbd/PKGBUILD
deleted file mode 100644
index 783c6145c..000000000
--- a/testing/kbd/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 163565 2012-07-16 01:58:51Z dreisner $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kbd
-pkgver=1.15.3
-pkgrel=3
-pkgdesc="Keytable files and keyboard utilities"
-arch=('i686' 'x86_64')
-url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
-license=('GPL')
-depends=('glibc')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
-        fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200'
-         '4ded3edb50fb7a3277bae6a870cee812')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ../fix-es.po.patch
-  # rename keymap files with the same names
-  # this is needed because when only name of keymap is specified
-  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
-  # this should be removed when upstream adopts the change
-  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
-  mv data/keymaps/i386/olpc/es{,-olpc}.map
-  mv data/keymaps/i386/olpc/pt{,-olpc}.map
-  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
-  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
-  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
-
-  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
-}
diff --git a/testing/kbd/fix-es.po.patch b/testing/kbd/fix-es.po.patch
deleted file mode 100644
index 578f0a7b7..000000000
--- a/testing/kbd/fix-es.po.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbd-1.15.3/po/es.old	2011-05-14 23:12:49.000000000 +0200
-+++ kbd-1.15.3/po/es.po	2011-05-15 21:07:02.120669404 +0200
-@@ -1363,7 +1363,7 @@
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
- 
- #: src/setkeycodes.c:21
- #, c-format
diff --git a/testing/kdeaccessibility-jovie/PKGBUILD b/testing/kdeaccessibility-jovie/PKGBUILD
deleted file mode 100644
index 9b6d6cb42..000000000
--- a/testing/kdeaccessibility-jovie/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167588 2012-10-02 19:15:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-jovie
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='A text to speech application'
-url='http://kde.org/applications/utilities/jovie/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime' 'speech-dispatcher')
-makedepends=('cmake' 'automoc4')
-replaces=('kdeaccessibility-kttsd')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz")
-sha1sums=('fbf63de8b286e8238383f49991ffb7651f9099d2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../jovie-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.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/kdeaccessibility-kaccessible/PKGBUILD b/testing/kdeaccessibility-kaccessible/PKGBUILD
deleted file mode 100644
index 76d4ca24d..000000000
--- a/testing/kdeaccessibility-kaccessible/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167589 2012-10-02 19:16:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kaccessible
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-url='https://projects.kde.org/projects/kde/kdeaccessibility/kaccessible'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdelibs' 'speech-dispatcher')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('e55ccb92ce22250a8d8139d2367ef9f35c5b34d1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kaccessible-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-kmag/PKGBUILD b/testing/kdeaccessibility-kmag/PKGBUILD
deleted file mode 100644
index 8dbc5a138..000000000
--- a/testing/kdeaccessibility-kmag/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167590 2012-10-02 19:16:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmag
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Screen Magnifier'
-url='http://kde.org/applications/utilities/kmag/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz")
-sha1sums=('4429196f346271a825e721be56e92189a3c0da2a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmag-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.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/kdeaccessibility-kmousetool/PKGBUILD b/testing/kdeaccessibility-kmousetool/PKGBUILD
deleted file mode 100644
index b5574a6f4..000000000
--- a/testing/kdeaccessibility-kmousetool/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167591 2012-10-02 19:17:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmousetool
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
-url='http://kde.org/applications/utilities/kmousetool/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz")
-sha1sums=('c9e27c71fd9bb01ee498cb0799d848611d031dcc')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmousetool-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.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/kdeaccessibility-kmouth/PKGBUILD b/testing/kdeaccessibility-kmouth/PKGBUILD
deleted file mode 100644
index 6e573b8ca..000000000
--- a/testing/kdeaccessibility-kmouth/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167592 2012-10-02 19:17:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmouth
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Speech Synthesizer Frontend'
-url='http://kde.org/applications/utilities/kmouth/'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz")
-sha1sums=('7e982aa5a57a9f671ec69f3504ca4dc50076778d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmouth-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.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/kdeadmin/PKGBUILD b/testing/kdeadmin/PKGBUILD
deleted file mode 100644
index 568029ab3..000000000
--- a/testing/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 167593 2012-10-02 19:18:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
-         'kdeadmin-ksystemlog'
-         'kdeadmin-kuser'
-         'kdeadmin-system-config-printer-kde')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'syslog-path.patch')
-sha1sums=('0b97528870a23440ba450f87be878e3abdf9e0e1'
-          '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	patch -p1 -i ${srcdir}/syslog-path.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_strigi-analyzer=OFF \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdeadmin-kcron() {
-	pkgdesc='Configure and schedule tasks'
-    url='http://userbase.kde.org/KCron'
-	depends=('kdelibs')
-	cd $srcdir/build/kcron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
-	pkgdesc='System log viewer tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/ksystemlog/"
-	cd $srcdir/build/ksystemlog
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksystemlog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
-	pkgdesc='User Manager'
-	depends=('kdebase-runtime' 'kdepimlibs')
-	url="http://kde.org/applications/system/kuser/"
-	install='kdeadmin.install'
-	cd $srcdir/build/kuser
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kuser
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
-	pkgdesc='Configure local and remote Printers'
-	depends=('kdebindings-python2' 'system-config-printer-common' 'cups' 'python2-gobject2')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/system-config-printer-kde
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/system-config-printer-kde
-	make DESTDIR=$pkgdir install
-
-    # Use the python2 executable
-    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
-    sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-        "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
-}
diff --git a/testing/kdeadmin/kdeadmin.install b/testing/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeadmin/kdeadmin.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/kdeadmin/syslog-path.patch b/testing/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/testing/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~	2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h	2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- 		SystemConfiguration() :
- 			GenericLogModeConfiguration(
- 					QLatin1String( SYSTEM_LOG_MODE_ID ),
--					QStringList() << QLatin1String( "/var/log/syslog" ),
-+					QStringList() << QLatin1String( "/var/log/messages.log" ),
- 					QList<int>() << INFORMATION_LOG_LEVEL_ID
- 			) {
- 
diff --git a/testing/kdeartwork/PKGBUILD b/testing/kdeartwork/PKGBUILD
deleted file mode 100644
index 9b342eb62..000000000
--- a/testing/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 167595 2012-10-02 19:18:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-aurorae'
-         'kdeartwork-colorschemes'
-         'kdeartwork-desktopthemes'
-         'kdeartwork-emoticons'
-         'kdeartwork-iconthemes'
-         'kdeartwork-kscreensaver'
-         'kdeartwork-sounds'
-         'kdeartwork-styles'
-         'kdeartwork-wallpapers'
-         'kdeartwork-weatherwallpapers')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeartwork')
-makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
-             'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6a93ed5fd33b27b88b653c15c546b223ed880a4d')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeartwork-aurorae() {
-	pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
-	cd $srcdir/build/aurorae
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
-	pkgdesc='KDE color schemes'
-    replaces=('kdeaccessibility-colorschemes')
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
-	pkgdesc='KDE desktop themes'
-	cd $srcdir/build/desktopthemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
-	pkgdesc='KDE emoticons'
-	cd $srcdir/build/emoticons
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
-	pkgdesc='KDE icon themes'
-    replaces=('kdeaccessibility-iconthemes')
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
-	pkgdesc='KDE screensaver'
-	depends=('kdebase-workspace' 'libkexiv2')
-	cd $srcdir/build/kscreensaver
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
-	pkgdesc='KDE sounds'
-	cd $srcdir/build/sounds
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
-	pkgdesc='KDE styles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/styles
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwin-styles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
-	pkgdesc='KDE wallpapers'
-	cd $srcdir/build/wallpapers
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/HighResolutionWallpapers
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
-	pkgdesc='KDE weather wallpapers'
-	cd $srcdir/build/WeatherWallpapers
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdebase-konsole/PKGBUILD b/testing/kdebase-konsole/PKGBUILD
deleted file mode 100644
index 791d73889..000000000
--- a/testing/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167597 2012-10-02 19:23:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://kde.org/applications/system/konsole/'
-pkgdesc="Terminal"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-depends=('kdebase-runtime' 'kdebase-lib')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('bab9dcab839cc975fb3b94ac383d25b94066fe92')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../konsole-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebase-runtime/PKGBUILD b/testing/kdebase-runtime/PKGBUILD
deleted file mode 100644
index 59341e999..000000000
--- a/testing/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164680 2012-08-02 15:21:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.9.0
-pkgrel=3
-pkgdesc="Plugins and applications necessary for the running of KDE applications"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-runtime'
-license=('GPL' 'LGPL')
-depends=('nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth'
-         'kactivities')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
-             'networkmanager')
-optdepends=('kdepimlibs: to generate drkonqi reports'
-            'htdig: to build the search index in khelpcenter'
-            'rarian: needed by khelpcenter'
-            'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
-sha1sums=('89a9e5c7e52cb925217b45a568a354cc041bc28d')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_QNtrack=OFF \
-        -DWITH_Xine=OFF
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-
-    ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/testing/kdebase-runtime/kdebase-runtime.install b/testing/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/testing/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD
deleted file mode 100644
index 50d2c2724..000000000
--- a/testing/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 169286 2012-10-18 19:49:13Z jgc $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.9.2
-pkgrel=5
-pkgdesc="Provides the interface and basic tools for the KDE workspace"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-workspace'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# 	not detected by namcap because libgl depends on it
-#	but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
-         'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage'
-         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
-         'xorg-xmessage' 'libusb-compat' 'kde-base-artwork')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'logind-support.patch')
-sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          '660eae40a707d2711d8d7f32a93214865506b795'
-          'b7980f2e199963caf8e92b499042d244ece2fca0'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
-          'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
-          'c079ebd157c836ba996190f0d2bcea1a7828d02c'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
-          'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
-
-build() {
-	cd ${_pkgname}-${pkgver}
-
-    # reads the shell scripts in /etc/kde/
-    patch -p0 -i "${srcdir}"/etc-scripts.patch
-    # FS#26120
-	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-
-    # KDEBUG#202629
-	patch -p0 -i "${srcdir}"/terminate-server.patch
-    # KDEBUG#307412 (fixed upstream)
-    patch -p1 -i "${srcdir}"/logind-support.patch
-
-    cd ../
-
-	mkdir build
-	cd build
-	cmake ../${_pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_Xmms=OFF \
-        -DWITH_Googlegadgets=OFF \
-        -DWITH_libgps=OFF \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DWITH_CkConnector=OFF
-	make
-}
-
-package() {
-	cd build
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
-	install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
-	install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
-
-	install -d -m755 "${pkgdir}"/usr/share/xsessions/
-	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
-      "${pkgdir}"/usr/share/xsessions/
-	install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
-
-	install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
-    install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
-    install -D -m644 "${srcdir}"/kdm.service \
-      "${pkgdir}"/usr/lib/systemd/system/kdm.service
-    install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
-}
diff --git a/testing/kdebase-workspace/etc-scripts.patch b/testing/kdebase-workspace/etc-scripts.patch
deleted file mode 100644
index 903a90a53..000000000
--- a/testing/kdebase-workspace/etc-scripts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/testing/kdebase-workspace/fixpath.patch b/testing/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/testing/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/testing/kdebase-workspace/kde-np.pam b/testing/kdebase-workspace/kde-np.pam
deleted file mode 100644
index eccaa08f4..000000000
--- a/testing/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
-auth		required	pam_shells.so
-auth		requisite	pam_nologin.so
-auth		required	pam_env.so
-auth		optional	pam_permit.s
-
-account		include      system-login
-
-password	include      system-login
-
-session		include      system-login
diff --git a/testing/kdebase-workspace/kde.pam b/testing/kdebase-workspace/kde.pam
deleted file mode 100644
index a0a29483d..000000000
--- a/testing/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		include		system-login
-
-account		include		system-login
-
-password	include		system-login
-
-session		include		system-login
diff --git a/testing/kdebase-workspace/kdebase-workspace.install b/testing/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/testing/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	groupadd -g 135 kdm &>/dev/null
-	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
-	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_remove() {
-	if getent passwd kdm >/dev/null 2>&1; then
-	  userdel kdm
-	fi
-	if getent group kdm >/dev/null 2>&1; then
-	  groupdel kdm
-	fi
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/testing/kdebase-workspace/kdm b/testing/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/testing/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/kdebase-workspace/kdm-xinitrd.patch b/testing/kdebase-workspace/kdm-xinitrd.patch
deleted file mode 100644
index f5fc0e571..000000000
--- a/testing/kdebase-workspace/kdm-xinitrd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
-+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
-@@ -742,6 +742,15 @@
- "[ -f /etc/xprofile ] && . /etc/xprofile\n"
- "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
- "\n"
-+"# run all system xinitrc shell scripts.\n"
-+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
-+"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
-+"  if [ -x \"$i\" ]; then\n"
-+"    . \"$i\"\n"
-+"  fi\n"
-+"  done\n"
-+"fi\n"
-+"\n"
- "if [ -d /etc/X11/Xresources ]; then\n"
- "  for i in /etc/X11/Xresources/*; do\n"
- "    [ -f $i ] && xrdb -merge $i\n"
diff --git a/testing/kdebase-workspace/kdm.logrotate b/testing/kdebase-workspace/kdm.logrotate
deleted file mode 100644
index 34331feae..000000000
--- a/testing/kdebase-workspace/kdm.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/kdm.log {
-    maxage 365
-    size=+1024k
-    notifempty
-    missingok
-}
diff --git a/testing/kdebase-workspace/kdm.service b/testing/kdebase-workspace/kdm.service
deleted file mode 100644
index c57aba920..000000000
--- a/testing/kdebase-workspace/kdm.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=K Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/kdm -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/testing/kdebase-workspace/kscreensaver.pam b/testing/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/testing/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/testing/kdebase-workspace/logind-support.patch b/testing/kdebase-workspace/logind-support.patch
deleted file mode 100644
index 9de205400..000000000
--- a/testing/kdebase-workspace/logind-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Lukas Tinkl <lukas@kde.org>
-Date: Fri, 05 Oct 2012 09:57:13 +0000
-Subject: store the filedescriptor in a member variable
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1
----
-store the filedescriptor in a member variable
-
-make systemd-inhibit work as intended, PowerDevil now handles
-power/sleep/lid buttons as intended
-
-BUG: 307412
----
-
-
---- a/powerdevil/daemon/powerdevilpolicyagent.cpp
-+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
-@@ -29,7 +29,6 @@
- #include <QtDBus/QDBusPendingReply>
- #include <QtDBus/QDBusConnectionInterface>
- #include <QtDBus/QDBusServiceWatcher>
--#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <KGlobal>
- #include <KDebug>
-@@ -225,6 +224,9 @@
-         onActiveSessionChanged(m_activeSessionPath);
- 
-         // inhibit systemd handling of power/sleep/lid buttons
-+        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
-+        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
-+
-         QVariantList args;
-         args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
-         args << "PowerDevil"; // who
-@@ -232,8 +234,9 @@
-         args << "block"; // mode
-         QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
-         desc.waitForFinished();
--        if (desc.isValid() && desc.value().isValid()) {
--            kDebug() << "systemd powersave events handling inhibited";
-+        if (desc.isValid()) {
-+            m_systemdInhibitFd = desc.value();
-+            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
-         }
-         else
-             kWarning() << "failed to inhibit systemd powersave handling";
-
---- a/powerdevil/daemon/powerdevilpolicyagent.h
-+++ b/powerdevil/daemon/powerdevilpolicyagent.h
-@@ -27,6 +27,7 @@
- #include <QtCore/QWeakPointer>
- 
- #include <QtDBus/QDBusContext>
-+#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <kdemacros.h>
- 
-@@ -108,6 +109,7 @@
-     QString m_activeSessionPath;
-     QWeakPointer< QDBusInterface > m_sdSessionInterface;
-     QWeakPointer< QDBusInterface > m_sdSeatInterface;
-+    QDBusUnixFileDescriptor m_systemdInhibitFd;
- 
-     // ConsoleKit support
-     bool m_ckAvailable;
-
diff --git a/testing/kdebase-workspace/terminate-server.patch b/testing/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/testing/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
- 
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/testing/kdebase/PKGBUILD b/testing/kdebase/PKGBUILD
deleted file mode 100644
index 0331990f3..000000000
--- a/testing/kdebase/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 167578 2012-10-02 19:09:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
-         'kdebase-kdepasswd'
-         'kdebase-kdialog'
-         'kdebase-keditbookmarks'
-         'kdebase-kfind'
-         'kdebase-konq-plugins'
-         'kdebase-konqueror'
-         'kdebase-lib'
-         'kdebase-plasma')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../kde-baseapps-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdebase-dolphin() {
-	pkgdesc='File Manager'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
-                'kdegraphics-thumbnailers: thumbnailers for graphics file'
-                'ruby: servicemenu installation')
-	url="http://kde.org/applications/system/dolphin/"
-        install=kdebase-dolphin.install
-	cd $srcdir/build/dolphin
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dolphin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
-	pkgdesc='Change Password'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	cd $srcdir/build/kdepasswd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdepasswd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
-	pkgdesc='A utility for displaying dialog boxes from shell scripts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kdialog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
-	pkgdesc='Bookmark Organizer and Editor'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/keditbookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
-	pkgdesc='Find Files/Folders'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	url="http://kde.org/applications/utilities/kfind/"
-	install='kdebase.install'
-	cd $srcdir/build/kfind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfind
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konq-plugins() {
-	pkgdesc='Extra plugins for Konqueror'
-	depends=('kdebase-konqueror' 'tidyhtml')
-	replaces=('konq-plugins')
-	install='kdebase.install'
-	cd $srcdir/build/konq-plugins
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
-	pkgdesc='KDE File Manager & Web Browser'
-	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-	optdepends=('kwebkitpart: to enable webkit engine')
-	url="http://kde.org/applications/internet/konqueror/"
-	install='kdebase-konqueror.install'
-        conflicts=('kdebase-nsplugins')
-        replaces=('kdebase-nsplugins')
-        for i in konqueror doc/konqueror nsplugins; do
-              cd $srcdir/build/${i}
-              make DESTDIR=$pkgdir install
-        done
-}
-
-package_kdebase-lib() {
-	pkgdesc='KDE libraries for the basic desktop applications'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/lib
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
-	pkgdesc='Display the contents of folders (User´s home folder as default)'
-	depends=('kdebase-workspace' 'kdebase-lib')
-	cd $srcdir/build/plasma
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdebase/kdebase-dolphin.install b/testing/kdebase/kdebase-dolphin.install
deleted file mode 100644
index 660593cf5..000000000
--- a/testing/kdebase/kdebase-dolphin.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/kdebase/kdebase-konqueror.install b/testing/kdebase/kdebase-konqueror.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdebase/kdebase-konqueror.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdebase/kdebase.install b/testing/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdebase/kdebase.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/kdebindings-kimono/PKGBUILD b/testing/kdebindings-kimono/PKGBUILD
deleted file mode 100644
index 3f70219e7..000000000
--- a/testing/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167598 2012-10-02 19:24:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.9.2
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the KDE libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qyoto' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz")
-sha1sums=('d8c762a6a65323f80e47cadbfa732b529a07dbc1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kimono-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Soprano=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-korundum/PKGBUILD b/testing/kdebindings-korundum/PKGBUILD
deleted file mode 100644
index 378407606..000000000
--- a/testing/kdebindings-korundum/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 167599 2012-10-02 19:24:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-korundum
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Ruby bindings for libraries created by the KDE community"
-url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qtruby' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz"
-        'ruby19.patch')
-sha1sums=('efa6b6b6bae89f8e16cbbcf8c5840c6cbdab57e3'
-          'c074f027bac3b9bffe70a2c2304a6a7be12be034')
-
-build() {
-  cd "${srcdir}/korundum-${pkgver}"
-  patch -p1 -i "${srcdir}/ruby19.patch"
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-
-  cmake ../korundum-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCUSTOM_RUBY_SITE_LIB_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]') \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]')
-
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-korundum/ruby19.patch b/testing/kdebindings-korundum/ruby19.patch
deleted file mode 100644
index c2468d9ce..000000000
--- a/testing/kdebindings-korundum/ruby19.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- korundum-4.9.0/src/krubypluginfactory.cpp~	2012-07-27 10:44:19.544464612 +0000
-+++ korundum-4.9.0/src/krubypluginfactory.cpp	2012-07-27 10:53:15.247374749 +0000
-@@ -39,7 +39,6 @@
- extern "C" {
- extern VALUE rb_load_path;
- extern VALUE qt_internal_module;
--void Init_prelude(void);
- }
- 
- //
-@@ -165,7 +164,8 @@
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude(); 
-+    char *opts[] = { "ruby", "-e;" };
-+    ruby_options(2, opts);
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
-@@ -342,7 +342,8 @@
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude();                                             
-+    char *opts[] = { "ruby", "-e;" };
-+    ruby_options(2, opts);
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
diff --git a/testing/kdebindings-kross/PKGBUILD b/testing/kdebindings-kross/PKGBUILD
deleted file mode 100644
index 4cfb2d320..000000000
--- a/testing/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 167600 2012-10-02 19:25:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-#         'kdebindings-kross-ruby'
-         'kdebindings-kross-java')
-pkgver=4.9.2
-pkgrel=1
-url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
-source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz")
-sha1sums=('9208e4ad1b8ad97f1220cd6696f22d8b1eab29cb')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kross-interpreters-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_ruby=OFF \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-kross-python() {
-  pkgdesc="Python2 language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'python2')
-
-  cd "${srcdir}"/build/python
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-java() {
-  pkgdesc="Java language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'java-environment')
-
-  cd "${srcdir}"/build/java
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-ruby() {
-  pkgdesc="Ruby language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'ruby')
-
-  cd "${srcdir}"/build/ruby
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-perlkde/PKGBUILD b/testing/kdebindings-perlkde/PKGBUILD
deleted file mode 100644
index 94f730e8f..000000000
--- a/testing/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167601 2012-10-02 19:25:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Perl bindings for the KDE libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-perlqt' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
-            'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
-sha1sums=('7ed1e54f5216e5bfd6b9709900d3df6b606910b5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlkde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-perlqt/PKGBUILD b/testing/kdebindings-perlqt/PKGBUILD
deleted file mode 100644
index bcf08e854..000000000
--- a/testing/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167572 2012-10-02 19:02:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Perl bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'perl-list-moreutils')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
-sha1sums=('1f7d70401c84fa54e937979a7c03d3fa8d7d59c2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-python/PKGBUILD b/testing/kdebindings-python/PKGBUILD
deleted file mode 100644
index a14201e78..000000000
--- a/testing/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 168840 2012-10-16 11:53:48Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
-         'kdebindings-python2')
-pkgver=4.9.2
-pkgrel=2
-url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        'pyqt495.patch')
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '0935c32e55806873f2d088613594559285da7e9c')
-
-build() {
-  export PYTHONDONTWRITEBYTECODE="TRUE"
-
-  cd pykde4-${pkgver}
-  patch -p1 -i "${srcdir}"/pyqt495.patch
-  cd ../ 
-
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
-  make
-  cd ..
-
-  mkdir build-python2
-  cd build-python2
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-python() {
-  pkgdesc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
-  pkgdesc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-  conflicts=('kdebindings-python<4.8.1-2')
- 
-  cd "${srcdir}"/build-python2
-  make DESTDIR="${pkgdir}" install
-
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/pykdeuic4
-  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
-    "${pkgdir}"/usr/bin/python2-pykdeuic4
-
-  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
-    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
-
-  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
-    "${pkgdir}"/usr/share/sip/python2-PyKDE4
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/testing/kdebindings-python/pyqt495.patch b/testing/kdebindings-python/pyqt495.patch
deleted file mode 100644
index b8a9df258..000000000
--- a/testing/kdebindings-python/pyqt495.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Mon, 01 Oct 2012 18:47:56 +0000
-Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
-X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&amp;a=commitdiff&amp;h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
----
-Remove duplicated QVector<int> definition, since it's in PyQt now.
-Simon, if you have time, please review if everything is OK.
-
-CCMAIL: simon@simonzone.com
----
-
-
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,78 +951,4 @@
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
-+
-
diff --git a/testing/kdebindings-qtruby/PKGBUILD b/testing/kdebindings-qtruby/PKGBUILD
deleted file mode 100644
index 10e0d715c..000000000
--- a/testing/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167575 2012-10-02 19:04:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Ruby bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'ruby')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
-sha1sums=('7d74ef9d0c66ef6c54fd25aeff89de7f06685dda')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qtruby-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCUSTOM_RUBY_SITE_LIB_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]') \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]')
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-qyoto/PKGBUILD b/testing/kdebindings-qyoto/PKGBUILD
deleted file mode 100644
index 2c11b1667..000000000
--- a/testing/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167574 2012-10-02 19:04:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.9.2
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'mono')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
-sha1sums=('549f386325cf02662c685f83b1844c72149255d1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qyoto-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-smokegen/PKGBUILD b/testing/kdebindings-smokegen/PKGBUILD
deleted file mode 100644
index b7369c5fa..000000000
--- a/testing/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167567 2012-10-02 18:59:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A general purpose C++ parser with a plugin infrastructure"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz")
-sha1sums=('f7ac776e18ad0df7535280ca5e6ea951cde159fb')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokegen-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-smokekde/PKGBUILD b/testing/kdebindings-smokekde/PKGBUILD
deleted file mode 100644
index 6b76999f2..000000000
--- a/testing/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167571 2012-10-02 19:02:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Language independent library for KDE bindings"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-optdepends=('kdesdk-kate: Kate bindings'
-            'kdegraphics-okular: Okular bindings')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('ad541046cf64df5a9ffda29979f8868a9c29c354')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokekde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-smokeqt/PKGBUILD b/testing/kdebindings-smokeqt/PKGBUILD
deleted file mode 100644
index f7c426b67..000000000
--- a/testing/kdebindings-smokeqt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167568 2012-10-02 18:59:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokeqt
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Language independent library for Qt bindings"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('a2f70eb2cb67942456604a6538e9cabe8a48aad5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokeqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Qwt5=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-analitza/PKGBUILD b/testing/kdeedu-analitza/PKGBUILD
deleted file mode 100644
index 5ff1646dd..000000000
--- a/testing/kdeedu-analitza/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167585 2012-10-02 19:14:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-analitza
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A library to add mathematical features to your program"
-url="https://projects.kde.org/projects/kde/kdeedu/analitza"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('065e449af454e08f02ece846fe5b28db09bda1be')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../analitza-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-blinken/PKGBUILD b/testing/kdeedu-blinken/PKGBUILD
deleted file mode 100644
index bc39e5c80..000000000
--- a/testing/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167602 2012-10-02 19:26:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Memory Enhancement Game"
-url="http://kde.org/applications/education/blinken/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz")
-sha1sums=('4f13e61086929da9ba75ee3b73612540054888b1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../blinken-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-blinken/kdeedu-blinken.install b/testing/kdeedu-blinken/kdeedu-blinken.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-blinken/kdeedu-blinken.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/kdeedu-cantor/PKGBUILD b/testing/kdeedu-cantor/PKGBUILD
deleted file mode 100644
index f0e100ab4..000000000
--- a/testing/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167603 2012-10-02 19:26:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="http://kde.org/applications/education/cantor/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza' 'libqalculate')
-makedepends=('cmake' 'automoc4' 'r')
-optdepends=('maxima: Maxima backend'
-            'octave: Octave backend'
-            'r: R backend')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('51b6cf08d43b6ea9fc285283a8ee1d8097b7349b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../cantor-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-cantor/kdeedu-cantor.install b/testing/kdeedu-cantor/kdeedu-cantor.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-cantor/kdeedu-cantor.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kalgebra/PKGBUILD b/testing/kdeedu-kalgebra/PKGBUILD
deleted file mode 100644
index b0030115c..000000000
--- a/testing/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167604 2012-10-02 19:27:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Graph Calculator"
-url="http://kde.org/applications/education/kalgebra/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
-sha1sums=('93aceea871e10eff771645f627563517684a11a5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kalgebra-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kalgebra/kdeedu-kalgebra.install b/testing/kdeedu-kalgebra/kdeedu-kalgebra.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-kalgebra/kdeedu-kalgebra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kalzium/PKGBUILD b/testing/kdeedu-kalzium/PKGBUILD
deleted file mode 100644
index cca0347d6..000000000
--- a/testing/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167605 2012-10-02 19:28:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Periodic Table of Elements"
-url="http://kde.org/applications/education/kalzium/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
-sha1sums=('d328ad31f50a33aefeb009411a1adb51c29850a2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kalzium-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kalzium/kdeedu-kalzium.install b/testing/kdeedu-kalzium/kdeedu-kalzium.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kalzium/kdeedu-kalzium.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/kdeedu-kanagram/PKGBUILD b/testing/kdeedu-kanagram/PKGBUILD
deleted file mode 100644
index afe645228..000000000
--- a/testing/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167606 2012-10-02 19:28:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Letter Order Game"
-url="http://kde.org/applications/education/kanagram/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz")
-sha1sums=('b6fd76d854473ab6dbfdfdcb09347e7c4363a580')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kanagram-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kanagram/kdeedu-kanagram.install b/testing/kdeedu-kanagram/kdeedu-kanagram.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kanagram/kdeedu-kanagram.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/kdeedu-kbruch/PKGBUILD b/testing/kdeedu-kbruch/PKGBUILD
deleted file mode 100644
index f8b104855..000000000
--- a/testing/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167607 2012-10-02 19:29:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Exercise Fractions"
-url="http://kde.org/applications/education/kbruch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz")
-sha1sums=('82c7c573d6c0c248ae2d8db24504d1943824d0da')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kbruch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kbruch/kdeedu-kbruch.install b/testing/kdeedu-kbruch/kdeedu-kbruch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kbruch/kdeedu-kbruch.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/kdeedu-kgeography/PKGBUILD b/testing/kdeedu-kgeography/PKGBUILD
deleted file mode 100644
index 57c0169ea..000000000
--- a/testing/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167608 2012-10-02 19:29:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Geography Trainer"
-url="http://kde.org/applications/education/kgeography/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz")
-sha1sums=('a68b02fd9ba765bce5d95b754dfd7eef70fa5743')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgeography-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kgeography/kdeedu-kgeography.install b/testing/kdeedu-kgeography/kdeedu-kgeography.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kgeography/kdeedu-kgeography.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/kdeedu-khangman/PKGBUILD b/testing/kdeedu-khangman/PKGBUILD
deleted file mode 100644
index a82203a37..000000000
--- a/testing/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167609 2012-10-02 19:30:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Hangman Game"
-url="http://kde.org/applications/education/khangman/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz")
-sha1sums=('6c11cf05fca993b7ddb7f92f68299a34470b5cd5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../khangman-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-khangman/kdeedu-khangman.install b/testing/kdeedu-khangman/kdeedu-khangman.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-khangman/kdeedu-khangman.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/kdeedu-kig/PKGBUILD b/testing/kdeedu-kig/PKGBUILD
deleted file mode 100644
index b815e56dd..000000000
--- a/testing/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167610 2012-10-02 19:31:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Interactive Geometry"
-url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('13b3d40b0d33b1a60b36278760e35f337089cc73')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kig-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Use the python2 executable
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
-}
diff --git a/testing/kdeedu-kig/kdeedu-kig.install b/testing/kdeedu-kig/kdeedu-kig.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-kig/kdeedu-kig.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kiten/PKGBUILD b/testing/kdeedu-kiten/PKGBUILD
deleted file mode 100644
index 10124965b..000000000
--- a/testing/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167611 2012-10-02 19:31:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Japanese Reference/Study Tool"
-url="http://kde.org/applications/education/kiten/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz")
-sha1sums=('86b4bd5f4b7ccc4f6e0769a8360e55ffebdc2eaf')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kiten-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kiten/kdeedu-kiten.install b/testing/kdeedu-kiten/kdeedu-kiten.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kiten/kdeedu-kiten.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/kdeedu-klettres/PKGBUILD b/testing/kdeedu-klettres/PKGBUILD
deleted file mode 100644
index eee3defe1..000000000
--- a/testing/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167612 2012-10-02 19:32:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Learn The Alphabet"
-url="http://kde.org/applications/education/klettres/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz")
-sha1sums=('177413e9f9e490a4c72d8f85d3bdd36ffd1ba934')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../klettres-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-klettres/kdeedu-klettres.install b/testing/kdeedu-klettres/kdeedu-klettres.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-klettres/kdeedu-klettres.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/kdeedu-kmplot/PKGBUILD b/testing/kdeedu-kmplot/PKGBUILD
deleted file mode 100644
index db7db52c9..000000000
--- a/testing/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167613 2012-10-02 19:33:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Mathematical Function Plotter"
-url="http://kde.org/applications/education/kmplot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz")
-sha1sums=('66fba97fc152925f87551be2dd283d4cbf06683f')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmplot-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kmplot/kdeedu-kmplot.install b/testing/kdeedu-kmplot/kdeedu-kmplot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-kmplot/kdeedu-kmplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-kstars/PKGBUILD b/testing/kdeedu-kstars/PKGBUILD
deleted file mode 100644
index 39c41b806..000000000
--- a/testing/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167614 2012-10-02 19:33:54Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Desktop Planetarium"
-url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libindi')
-makedepends=('cmake' 'automoc4' 'eigen')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('144409ebfb2a2c3d040ab4a1ad130b5677dd23b6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kstars-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Xplanet=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kstars/kdeedu-kstars.install b/testing/kdeedu-kstars/kdeedu-kstars.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kstars/kdeedu-kstars.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/kdeedu-ktouch/PKGBUILD b/testing/kdeedu-ktouch/PKGBUILD
deleted file mode 100644
index 10c8d3d79..000000000
--- a/testing/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167615 2012-10-02 19:34:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Touch Typing Tutor"
-url="http://kde.org/applications/education/ktouch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('99133b52b29a7ee4d3dd6da664ad8c47fd637b71')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktouch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-ktouch/kdeedu-ktouch.install b/testing/kdeedu-ktouch/kdeedu-ktouch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-ktouch/kdeedu-ktouch.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/kdeedu-kturtle/PKGBUILD b/testing/kdeedu-kturtle/PKGBUILD
deleted file mode 100644
index 867463af9..000000000
--- a/testing/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167616 2012-10-02 19:35:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Educational Programming Environment"
-url="http://kde.org/applications/education/kturtle/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz")
-sha1sums=('c30e80f71dc622b818d6539054f91584b0dce444')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kturtle-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kturtle/kdeedu-kturtle.install b/testing/kdeedu-kturtle/kdeedu-kturtle.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-kturtle/kdeedu-kturtle.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/kdeedu-kwordquiz/PKGBUILD b/testing/kdeedu-kwordquiz/PKGBUILD
deleted file mode 100644
index 6ce3f425d..000000000
--- a/testing/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167617 2012-10-02 19:35:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Flash Card Trainer"
-url="http://kde.org/applications/education/kwordquiz/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz")
-sha1sums=('53c702a88bd9cb0c8fba54d6353d06005760bd71')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kwordquiz-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-marble/PKGBUILD b/testing/kdeedu-marble/PKGBUILD
deleted file mode 100644
index 2dedbdc26..000000000
--- a/testing/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167580 2012-10-02 19:10:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Desktop Globe"
-url="http://kde.org/applications/education/marble/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: gps support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('71f0ab4845a7bf5505eba0bf5b654720a59d4028')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../marble-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-marble/kdeedu-marble.install b/testing/kdeedu-marble/kdeedu-marble.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-marble/kdeedu-marble.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-pairs/PKGBUILD b/testing/kdeedu-pairs/PKGBUILD
deleted file mode 100644
index 29830e669..000000000
--- a/testing/kdeedu-pairs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167618 2012-10-02 19:36:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-pairs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A memory and pairs game for KDE"
-url="https://projects.kde.org/projects/kde/kdeedu/pairs"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz")
-sha1sums=('8ed40356ee7df8059935e945e070667dfffcc77b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pairs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-pairs/kdeedu-pairs.install b/testing/kdeedu-pairs/kdeedu-pairs.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-pairs/kdeedu-pairs.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-parley/PKGBUILD b/testing/kdeedu-parley/PKGBUILD
deleted file mode 100644
index 1172c66f1..000000000
--- a/testing/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167621 2012-10-02 19:37:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Vocabulary Trainer"
-url="http://kde.org/applications/education/parley/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz")
-sha1sums=('397e58d783f75f48e8cf5a3a35f1fa441010b50b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../parley-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-parley/kdeedu-parley.install b/testing/kdeedu-parley/kdeedu-parley.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-parley/kdeedu-parley.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-rocs/PKGBUILD b/testing/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index a7c3d2cdb..000000000
--- a/testing/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167622 2012-10-02 19:37:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Rocs Graph Theory"
-url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('8c3ba1c2b15a795147110f246853217d301f903b')
-options=('!makeflags')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../rocs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-step/PKGBUILD b/testing/kdeedu-step/PKGBUILD
deleted file mode 100644
index 92a7ba92a..000000000
--- a/testing/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167623 2012-10-02 19:38:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Interactive Physical Simulator"
-url="http://kde.org/applications/education/step/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libqalculate' 'gsl')
-makedepends=('cmake' 'automoc4' 'eigen')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('7545eee07323935773466cfd3a241fbd8786ef13')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../step-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-step/kdeedu-step.install b/testing/kdeedu-step/kdeedu-step.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeedu-step/kdeedu-step.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/kdegames/PKGBUILD b/testing/kdegames/PKGBUILD
deleted file mode 100644
index cd2a79932..000000000
--- a/testing/kdegames/PKGBUILD
+++ /dev/null
@@ -1,435 +0,0 @@
-# $Id: PKGBUILD 167624 2012-10-02 19:40:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
-         'kdegames-bovo'
-         'kdegames-granatier'
-         'kdegames-kajongg'
-         'kdegames-kapman'
-         'kdegames-katomic'
-         'kdegames-kblackbox'
-         'kdegames-kblocks'
-         'kdegames-kbounce'
-         'kdegames-kbreakout'
-         'kdegames-kdiamond'
-         'kdegames-kfourinline'
-         'kdegames-kgoldrunner'
-         'kdegames-kigo'
-         'kdegames-killbots'
-         'kdegames-kiriki'
-         'kdegames-kjumpingcube'
-         'kdegames-klines'
-         'kdegames-klickety'
-         'kdegames-kmahjongg'
-         'kdegames-kmines'
-         'kdegames-knavalbattle'
-         'kdegames-knetwalk'
-         'kdegames-kolf'
-         'kdegames-kollision'
-         'kdegames-konquest'
-         'kdegames-kpatience'
-         'kdegames-kreversi'
-         'kdegames-kshisen'
-         'kdegames-ksirk'
-         'kdegames-ksnakeduel'
-         'kdegames-kspaceduel'
-         'kdegames-ksquares'
-         'kdegames-ksudoku'
-         'kdegames-ktuberling'
-         'kdegames-kubrick'
-         'kdegames-libkdegames'
-         'kdegames-libkmahjongg'
-         'kdegames-lskat'
-         'kdegames-palapeli')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2'
-             'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('a751f6b9ed6c24f8a420d6737be87f2bbb0c2cb3')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdegames-bomber() {
-	pkgdesc='Arcade Bombing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bomber/"
-	install='kdegames.install'
-	cd $srcdir/build/bomber
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
-	pkgdesc='Five-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bovo/"
-	install='kdegames.install'
-	cd $srcdir/build/bovo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
-	pkgdesc='Granatier'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/granatier/"
-	install='kdegames.install'
-	cd $srcdir/build/granatier
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
-	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted')
-        url="http://www.kde.org/applications/games/kajongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kajongg
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
-	pkgdesc='Eat pills escaping ghosts'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kapman/"
-	install='kdegames.install'
-	cd $srcdir/build/kapman
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
-	pkgdesc='Sokoban-like Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/katomic/"
-	install='kdegames.install'
-	cd $srcdir/build/katomic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knavalbattle() {
-	pkgdesc='Naval Battle'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knavalbattle/"
-	install='kdegames-knavalbattle.install'
-    replaces=('kdegames-kbattleship')
-    conflicts=('kdegames-kbattleship')
-    cd $srcdir/build/knavalbattle
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblackbox() {
-	pkgdesc='Blackbox Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblackbox/"
-	install='kdegames.install'
-	cd $srcdir/build/kblackbox
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
-	pkgdesc='Falling Blocks Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblocks/"
-	install='kdegames.install'
-	cd $srcdir/build/kblocks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
-	pkgdesc='Ball Bouncing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbounce/"
-	install='kdegames.install'
-	cd $srcdir/build/kbounce
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
-	pkgdesc='Breakout-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbreakout/"
-	install='kdegames.install'
-	cd $srcdir/build/kbreakout
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
-	pkgdesc='Three-in-a-row game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kdiamond/"
-	install='kdegames.install'
-	cd $srcdir/build/kdiamond
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
-	pkgdesc='Four-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kfourinline/"
-	install='kdegames-kfourinline.install'
-	cd $srcdir/build/kfourinline
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
-	pkgdesc='A game of action and puzzle-solving'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/kgoldrunner/"
-	install='kdegames.install'
-	cd $srcdir/build/kgoldrunner
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
-	pkgdesc='Go Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
-	url="http://kde.org/applications/games/kigo/"
-	install='kdegames-kigo.install'
-	cd $srcdir/build/kigo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
-	pkgdesc='Killbots'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/killbots/"
-	install='kdegames.install'
-	cd $srcdir/build/killbots
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
-	pkgdesc='Yahtzee-like Dice Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kiriki/"
-	install='kdegames.install'
-	cd $srcdir/build/kiriki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
-	pkgdesc='Territory Capture Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kjumpingcube/"
-	install='kdegames.install'
-	cd $srcdir/build/kjumpingcube
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
-	pkgdesc='Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	replaces=('kdegames-ksame')
-	conflicts=('kdegames-ksame')
-	url="http://kde.org/applications/games/ksame/"
-	install='kdegames.install'
-	cd $srcdir/build/klickety
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
-	pkgdesc='Tactical Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/klines/"
-	install='kdegames.install'
-	cd $srcdir/build/klines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
-	pkgdesc='Mahjongg Solitaire'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kmahjongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
-	pkgdesc='Minesweeper-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kmines/"
-	install='kdegames.install'
-	cd $srcdir/build/kmines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
-	pkgdesc='Network Construction Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knetwalk/"
-	install='kdegames.install'
-	cd $srcdir/build/knetwalk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
-	pkgdesc='Miniature Golf'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kolf/"
-	install='kdegames-kolf.install'
-	cd $srcdir/build/kolf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
-	pkgdesc='A simple ball dodging game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kollision/"
-	install='kdegames.install'
-	cd $srcdir/build/kollision
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
-	pkgdesc='Galactic Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/konquest/"
-	install='kdegames.install'
-	cd $srcdir/build/konquest
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
-	pkgdesc='Patience Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kpatience/"
-	install='kdegames-kpatience.install'
-	replaces=('kdegames-kpat')
-	cd $srcdir/build/kpat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
-	pkgdesc='Reversi Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kshisen() {
-	pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kshisen/"
-	install='kdegames.install'
-	cd $srcdir/build/kshisen
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
-	pkgdesc='World Domination Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksirk/"
-	install='kdegames.install'
-	cd $srcdir/build/ksirk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
-	pkgdesc='Space Arcade Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kspaceduel/"
-	install='kdegames-kspaceduel.install'
-	cd $srcdir/build/kspaceduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
-	pkgdesc='Connect the dots to create squares'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksudoku() {
-	pkgdesc='KSudoku, Sudoku game & more for KDE'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksudoku/"
-	install='kdegames.install'
-	cd $srcdir/build/ksudoku
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksnakeduel() {
-	pkgdesc='Snake-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksnakeduel/"
-	install='kdegames.install'
-    replaces=('kdegames-ktron')
-    conflicts=('kdegames-ktron')
-	cd $srcdir/build/ksnakeduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
-	pkgdesc='Picture Game for Children'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktuberling/"
-	install='kdegames-ktuberling.install'
-	cd $srcdir/build/ktuberling
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
-	pkgdesc='A 3-D game based on Rubik´s Cube'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kubrick/"
-	install='kdegames.install'
-	cd $srcdir/build/kubrick
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
-	pkgdesc='KDE game library'
-	groups=()
-	depends=('kdelibs' 'openal')
-	cd $srcdir/build/libkdegames
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkmahjongg() {
-	pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
-	pkgdesc='Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/lskat/"
-	install='kdegames-lskat.install'
-	cd $srcdir/build/lskat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
-	pkgdesc='Jigsaw puzzle game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/palapeli/"
-	install='kdegames-palapeli.install'
-	cd $srcdir/build/palapeli
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdegames/kdegames-kbattleship.install b/testing/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegames/kdegames-kfourinline.install b/testing/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kfourinline.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-kigo.install b/testing/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kigo.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-knavalbattle.install b/testing/kdegames/kdegames-knavalbattle.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegames/kdegames-knavalbattle.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegames/kdegames-kolf.install b/testing/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kolf.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-kpatience.install b/testing/kdegames/kdegames-kpatience.install
deleted file mode 100644
index 3af34a012..000000000
--- a/testing/kdegames/kdegames-kpatience.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-kspaceduel.install b/testing/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-kspaceduel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-ktuberling.install b/testing/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-ktuberling.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-lskat.install b/testing/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/testing/kdegames/kdegames-lskat.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdegames/kdegames-palapeli.install b/testing/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/testing/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegames/kdegames.install b/testing/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdegames/kdegames.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/kdegraphics-gwenview/PKGBUILD b/testing/kdegraphics-gwenview/PKGBUILD
deleted file mode 100644
index 252ce0542..000000000
--- a/testing/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167625 2012-10-02 19:42:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A fast and easy to use image viewer for KDE"
-url="http://kde.org/applications/graphics/gwenview/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-lib' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins: extra plugins to share photos')
-install=$pkgname.install
-source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
-sha1sums=('5a48c195d4c305f166b2d9fc1a483457c4698156')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../gwenview-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-gwenview/kdegraphics-gwenview.install b/testing/kdegraphics-gwenview/kdegraphics-gwenview.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-gwenview/kdegraphics-gwenview.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-kamera/PKGBUILD b/testing/kdegraphics-kamera/PKGBUILD
deleted file mode 100644
index e1698bba0..000000000
--- a/testing/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167626 2012-10-02 19:43:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Configure Kamera"
-url="http://kde.org/applications/graphics/kamera/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'gphoto2')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
-sha1sums=('5b5b68b8996fdb1cb6541704c03d36cf506e8827')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kamera-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kcolorchooser/PKGBUILD b/testing/kdegraphics-kcolorchooser/PKGBUILD
deleted file mode 100644
index b2098a07a..000000000
--- a/testing/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167627 2012-10-02 19:43:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Color Chooser"
-url="http://kde.org/applications/graphics/kcolorchooser/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz")
-sha1sums=('7e34705505140cc3e6085fc057365ce4cab2c0a0')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcolorchooser-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.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/kdegraphics-kgamma/PKGBUILD b/testing/kdegraphics-kgamma/PKGBUILD
deleted file mode 100644
index 3340fb97f..000000000
--- a/testing/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167628 2012-10-02 19:44:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A monitor calibration tool"
-url="http://kde.org/applications/graphics/kgamma/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-# note on libxxf86vm:
-#       not detected by namcap because libgl depends on it
-#       but nvidia providing libgl does not depend on libxxf86vm
-depends=('kdebase-runtime' 'libxxf86vm')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz")
-sha1sums=('553d40c87000c57a10f64f01313ca519148530da')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgamma-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kolourpaint/PKGBUILD b/testing/kdegraphics-kolourpaint/PKGBUILD
deleted file mode 100644
index 0089a8b03..000000000
--- a/testing/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167629 2012-10-02 19:44:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Paint Program"
-url="http://kde.org/applications/graphics/kolourpaint/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz")
-sha1sums=('a7a8fb6c63dc87e239bb54c2f178d2d5412296f3')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kolourpaint-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-kruler/PKGBUILD b/testing/kdegraphics-kruler/PKGBUILD
deleted file mode 100644
index 7a20b3178..000000000
--- a/testing/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167630 2012-10-02 19:44:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Screen Ruler"
-url="http://kde.org/applications/graphics/kruler/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz")
-sha1sums=('59fe8c2246d3d7e8c8307a4d72fae78caec20681')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kruler-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-kruler/kdegraphics-kruler.install b/testing/kdegraphics-kruler/kdegraphics-kruler.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-kruler/kdegraphics-kruler.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-ksaneplugin/PKGBUILD b/testing/kdegraphics-ksaneplugin/PKGBUILD
deleted file mode 100644
index d5e587d6e..000000000
--- a/testing/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167631 2012-10-02 19:45:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A scan plugin that implements the scanning"
-url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libksane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz")
-sha1sums=('91b1ef55620bc621a81d0e75643e47d0a115e524')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksaneplugin-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-ksnapshot/PKGBUILD b/testing/kdegraphics-ksnapshot/PKGBUILD
deleted file mode 100644
index 8cd949f39..000000000
--- a/testing/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167632 2012-10-02 19:45:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Screen Capture Program"
-url="http://kde.org/applications/graphics/ksnapshot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdelibs' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('3496d070420f8aff10e69c98728c5c1ca34f6d47')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksnapshot-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-mobipocket/PKGBUILD b/testing/kdegraphics-mobipocket/PKGBUILD
deleted file mode 100644
index 851dc49c1..000000000
--- a/testing/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167633 2012-10-02 19:46:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A collection of plugins to handle mobipocket files"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
-groups=('kde' 'kdegraphics')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('81590d0958cebc3a052a4d973334f3fe4a9eabe4')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install
deleted file mode 100644
index 660593cf5..000000000
--- a/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.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/kdegraphics-okular/PKGBUILD b/testing/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index 784e8b3f2..000000000
--- a/testing/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167569 2012-10-02 19:00:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-         'ebook-tools' 'libspectre')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('2260afa2f0b7bf6afb2da5129fefd95b144dcd74')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-okular/kdegraphics-okular.install b/testing/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-strigi-analyzer/PKGBUILD b/testing/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index 50f2b6a52..000000000
--- a/testing/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167634 2012-10-02 19:46:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d9923f5e52fc58c50bf83d7854ce1ec615407753')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-svgpart/PKGBUILD b/testing/kdegraphics-svgpart/PKGBUILD
deleted file mode 100644
index d7c1954ef..000000000
--- a/testing/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167635 2012-10-02 19:47:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A KPart for viewing SVGs"
-url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz")
-sha1sums=('06584ae6652d0ea2265c47599dbb6789c973f1fc')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../svgpart-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdegraphics-thumbnailers/PKGBUILD b/testing/kdegraphics-thumbnailers/PKGBUILD
deleted file mode 100644
index 24f3f0b2f..000000000
--- a/testing/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167636 2012-10-02 19:47:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Thumbnailers for various graphics file formats"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libkexiv2' 'libkdcraw')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c87d00fa6af8fd1d57b0da74cdb382dd7d6f5311')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdelibs3/PKGBUILD b/testing/kdelibs3/PKGBUILD
deleted file mode 100644
index b3efef435..000000000
--- a/testing/kdelibs3/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# $Id: PKGBUILD 169643 2012-10-25 01:35:25Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kdelibs3
-pkgver=3.5.10
-pkgrel=15
-pkgdesc='KDE3 Core Libraries'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
-         'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell')
-optdepends=('hspell: for Hebrew spell-checking support')
-options=('libtool' '!makeflags')
-install=kdelibs3.install
-source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2"
-        'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
-        'acinclude.patch'
-        'kde3.profile'
-        'kde4-compatibility.patch'
-        'kconf_updaterc'
-        'openssl.patch'
-        'kdelibs3-missing-include.patch'
-	'kdelibs3-cups16.patch')
-sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
-          'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
-          '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
-          'fbd6e773edf3e8bb8e1272629984025e041da2ca'
-          '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
-          '35e56fe4c5f71685e64b13f448dcacc620166e06'
-          '50e92950498463defb9149ffcf8cbc2e8cd1063b'
-          'e5f5b8c060a2db9cedb82bf18caadfa869921779'
-          '6a6c544b3336bfe89bb17ef737d783a7ec006c6c')
-
-build() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	. /etc/profile.d/qt3.sh
-	. "$srcdir"/kde3.profile
-
-	patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
-	patch -p1 -i "$srcdir"/acinclude.patch
-	patch -p1 -i "$srcdir"/kde4-compatibility.patch
-	patch -p1 -i "${srcdir}"/openssl.patch
-	patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
-	patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch
-
-	sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-	make -f admin/Makefile.common cvs
-
-	./configure --prefix=/opt/kde \
-		--with-distribution='Arch Linux' \
-		--with-alsa \
-		--disable-debug \
-		--disable-dnssd \
-		--disable-dnotify \
-		--enable-inotify \
-		--enable-sendfile \
-		--without-lua \
-		--with-hspell \
-		--enable-gcc-hidden-visibility \
-		--enable-final \
-		--enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \
-		--without-arts \
-		--disable-libfam
-	make
-}
-
-package() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	make DESTDIR="$pkgdir" install
-
-	# disable broken kconf_update by default
-	install -D -m644 "$srcdir"/kconf_updaterc \
-      "$pkgdir"/opt/kde/share/config/kconf_updaterc
-
-	# install KDE3 profile
-	install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh
-	# make KDE3 styles available to Qt3
-	install -d -m755 "$pkgdir"/opt/qt/plugins
-	ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles
-
-	# cert bundle seems to be hardcoded
-	# link it to the one from ca-certificates
-	rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-	ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-
-	# we don't have khelpcenter anyway
-	rm -rf "$pkgdir"/opt/kde/share/doc
-
-	install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-	echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf
-}
diff --git a/testing/kdelibs3/acinclude.patch b/testing/kdelibs3/acinclude.patch
deleted file mode 100644
index 0610d6df5..000000000
--- a/testing/kdelibs3/acinclude.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-2009-12-10  Stepan Kasal  <skasal@redhat.com>
-
-The change of implementation of AC_REQUIRE in 2.64 caused a regression
-in the arts project.
-This can be fixed by shuffling some macro calls.
-
-I suppose that most of this patch will not be needed with a future
-release of Autoconf.
-But the last chunk of this patch is a real bug in this source and
-should go upstream.
-
---- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
-+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
-@@ -3081,8 +3081,18 @@
- fi
- ])
- 
-+AC_DEFUN([AC_CHECK_COMPILERS_CC],
-+[ 
-+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-+  CFLAGS=" $CFLAGS"
-+  AC_PROG_CC
-+  CXXFLAGS=" $CXXFLAGS"
-+  AC_PROG_CXX
-+])
-+
- AC_DEFUN([AC_CHECK_COMPILERS],
- [
-+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
-   AC_ARG_ENABLE(debug,
- 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-   [
-@@ -3141,11 +3151,6 @@
-     [kde_use_profiling="no"]
-   )
- 
--  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
--  CFLAGS=" $CFLAGS"
--
--  AC_PROG_CC 
--
-   AC_PROG_CPP
- 
-   if test "$GCC" = "yes"; then
-@@ -3174,10 +3179,6 @@
-      LDFLAGS=""
-   fi
- 
--  CXXFLAGS=" $CXXFLAGS"
--
--  AC_PROG_CXX
--
-   KDE_CHECK_FOR_BAD_COMPILER
- 
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-@@ -3503,8 +3504,8 @@
- AC_REQUIRE([AC_LIBTOOL_DLOPEN])
- AC_REQUIRE([KDE_CHECK_LIB64])
- 
--AC_OBJEXT
--AC_EXEEXT
-+AC_REQUIRE([AC_OBJEXT])
-+AC_REQUIRE([AC_EXEEXT])
- 
- AM_PROG_LIBTOOL
- AC_LIBTOOL_CXX
diff --git a/testing/kdelibs3/kconf_updaterc b/testing/kdelibs3/kconf_updaterc
deleted file mode 100644
index 24c2623fb..000000000
--- a/testing/kdelibs3/kconf_updaterc
+++ /dev/null
@@ -1,2 +0,0 @@
-updateInfoAdded=false
-autoUpdateDisabled=true
diff --git a/testing/kdelibs3/kde3.profile b/testing/kdelibs3/kde3.profile
deleted file mode 100755
index ef09631ff..000000000
--- a/testing/kdelibs3/kde3.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export PATH=$PATH:/opt/kde/bin
-if [ ! -z $XDG_DATA_DIRS ]; then
-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share
-else
-  export XDG_DATA_DIRS=/opt/kde/share
-fi
diff --git a/testing/kdelibs3/kde4-compatibility.patch b/testing/kdelibs3/kde4-compatibility.patch
deleted file mode 100644
index 129c314ae..000000000
--- a/testing/kdelibs3/kde4-compatibility.patch
+++ /dev/null
@@ -1,1012 +0,0 @@
-diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp
---- kdelibs-3.5.10/kdecore/kcrash.cpp	2007-01-15 12:34:17.000000000 +0100
-+++ kdelibs-3.5.10.new/kdecore/kcrash.cpp	2009-08-06 06:18:06.000000000 +0200
-@@ -158,7 +158,7 @@
-           int i = 0;
- 
-           // argument 0 has to be drkonqi
--          argv[i++] = "drkonqi";
-+          argv[i++] = "/usr/lib/kde4/libexec/drkonqi";
- 
- #if defined Q_WS_X11
-           // start up on the correct display
-@@ -325,7 +325,7 @@
-       _exit(253);
-     if(!geteuid() && setuid(getuid()) < 0)
-       _exit(253);
--    execvp("drkonqi", const_cast< char** >( argv ));
-+    execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv ));
-     _exit(errno);
-   }
-   else
-diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am
---- kdelibs-3.5.10/kded/Makefile.am	2005-10-10 17:06:29.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.am	2009-08-06 06:21:37.000000000 +0200
-@@ -58,7 +58,7 @@
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
- 
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- 
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
-diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in
---- kdelibs-3.5.10/kded/Makefile.in	2008-08-20 18:05:57.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.in	2009-08-06 06:22:19.000000000 +0200
-@@ -535,7 +535,7 @@
- 
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
- #>- all: all-am
-@@ -1173,7 +1173,7 @@
- 	-rm -f  kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc
- 
- #>+ 2
--KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
-+KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
- 
- #>+ 2
- docs-am:
-diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu
---- kdelibs-3.5.10/kded/applications.menu	2005-09-10 10:27:40.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/applications.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,469 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--	<Name>Applications</Name>
--	<Directory>kde-main.directory</Directory>
--	<!-- Search the default locations -->
--	<KDELegacyDirs/>
--	<DefaultAppDirs/>
--	<DefaultDirectoryDirs/>
--	<DefaultLayout>
--		<Merge type="menus"/>
--		<Merge type="files"/>
--		<Separator/>
--		<Menuname>More</Menuname>
--	</DefaultLayout>
--	<Layout>
--		<Merge type="menus"/>
--		<Menuname>Applications</Menuname>
--		<Merge type="files"/>
--	</Layout>
--
--	<Menu>
--		<Name>Applications</Name>
--		<Directory>kde-unknown.directory</Directory>
--		<OnlyUnallocated/>
--		<Include>
--			<Not>
--				<!-- Don't list non-KDE core applications -->
--				<And>
--					<Category>Core</Category>
--					<Not><Category>KDE</Category></Not>
--				</And>
--				<!-- Don't list SUSE's YaST in here -->
--				<Category>X-SuSE-YaST</Category>
--			</Not>
--		</Include>
--	</Menu>
--       <Menu>
--                <Name>Development</Name>
--                <Directory>kde-development.directory</Directory>
--                <Menu>
--                        <Name>X-KDE-KDevelopIDE</Name>
--                        <Directory>kde-development-kdevelop.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Development</Category>
--                                <Category>X-KDE-KDevelopIDE</Category>
--                                </And>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>Translation</Name>
--			<Directory>kde-development-translation.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>Translation</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Web Development</Name>
--			<Directory>kde-development-webdevelopment.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>WebDevelopment</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Include>
--                        <And>
--                        <Category>Development</Category>
--                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
--                        <Not><Category>Translation</Category></Not>
--                        <Not><Category>WebDevelopment</Category></Not>
--                        </And>
--                </Include>
--        </Menu>
--	<Menu>
--		<Name>Science</Name>
--		<Directory>kde-science.directory</Directory>
--		<Include>
--			<And><!-- Include /any/ Science app which is not an Education app -->
--				<Or>
--					<Category>Astronomy</Category>
--					<Category>Biology</Category>
--					<Category>Chemistry</Category>
--					<Category>Geology</Category>
--					<Category>MedicalSoftware</Category>
--					<Category>Physics</Category>
--					<Category>Math</Category>
--					<Category>Science</Category>
--				</Or>
--				<Not><Category>Education</Category></Not>
--			</And>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Edutainment</Name>
--		<Directory>kde-edutainment.directory</Directory>
--		<Menu>
--			<Name>Languages</Name>
--			<Directory>kde-edu-languages.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Mathematics</Name>
--			<Directory>kde-edu-mathematics.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Math</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Miscellaneous</Name>
--			<Directory>kde-edu-miscellaneous.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Not>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				<Category>Math</Category>
--				<Category>Science</Category>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Not>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Science</Name>
--			<Directory>kde-edu-science.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Science</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Tools</Name>
--			<Directory>kde-edu-tools.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Games</Name>
--		<Directory>kde-games.directory</Directory>
--		<Menu>
--			<Name>Arcade</Name>
--			<Directory>kde-games-arcade.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>ArcadeGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Board</Name>
--			<Directory>kde-games-board.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>BoardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Card</Name>
--			<Directory>kde-games-card.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>CardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Kidsgames</Name>
--			<Directory>kde-games-kids.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Or>
--				<Category>X-KDE-KidsGame</Category>
--				<Category>KidsGame</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>TacticStrategy</Name>
--			<Directory>kde-games-strategy.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>StrategyGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Include>
--			<And>
--			<Category>Game</Category>
--			<Not>
--			<Category>ArcadeGame</Category>
--			<Category>BoardGame</Category>
--			<Category>CardGame</Category>
--			<Category>X-KDE-KidsGame</Category>
--			<Category>KidsGame</Category>
--			<Category>StrategyGame</Category>
--			</Not>
--			</And>
--		</Include>
--               <Menu>
--                        <Name>Toys</Name>
--                        <Directory>kde-toys.directory</Directory>
--                        <Include>
--                                 <Category>Amusement</Category>
--                        </Include>
--               </Menu>
--	</Menu>
--	<Menu>
--		<Name>Graphics</Name>
--		<Directory>kde-graphics.directory</Directory>
--		<Include>
--			<And>
--			<Category>Graphics</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Graphics</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Internet</Name>
--		<Directory>kde-internet.directory</Directory>
--		<Include>
--			<And>
--			<Category>Network</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--		  <Name>Terminal</Name>
--		  <Directory>kde-internet-terminal.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Network</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Multimedia</Name>
--		<Directory>kde-multimedia.directory</Directory>
--		<Include>
--			<And>
--			<Category>AudioVideo</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>AudioVideo</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Office</Name>
--		<Directory>kde-office.directory</Directory>
--		<Layout>
--			<Merge type="menus"/>
--			<Filename>kde-koshell.desktop</Filename>
--			<Filename>kde-Kontact.desktop</Filename>
--			<Separator/>
--			<Filename>kde-kword.desktop</Filename>
--			<Filename>kde-kspread.desktop</Filename>
--			<Filename>kde-kpresenter.desktop</Filename>
--			<Merge type="files"/>
--			<Separator/>
--			<Menuname>More</Menuname>
--		</Layout>
--		<Include>
--                        <And>
--			<Category>Office</Category>
--                        <Not><Category>X-KDE-More</Category></Not>
--                        </And>
--                </Include>
--                <Menu>
--                        <Name>More</Name>
--                        <Directory>kde-more.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Office</Category>
--                                <Category>X-KDE-More</Category>
--                                </And>
--                        </Include>
--                </Menu>
--	</Menu>
--	<Menu>
--		<Name>Settingsmenu</Name>
--		<Directory>kde-settingsmenu.directory</Directory>
--		<Include>
--			<Category>Settings</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>System</Name>
--		<Directory>kde-system.directory</Directory>
--		<Include>
--			<And>
--			<Category>System</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>System</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>ScreenSavers</Name>
--			<Directory>kde-system-screensavers.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>Terminal</Name>
--			<Directory>kde-system-terminal.directory</Directory>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Utilities</Name>
--		<Directory>kde-utilities.directory</Directory>
--		<Include>
--			<And>
--			<Category>Utility</Category>
--			<Not><Category>Accessibility</Category></Not>
--			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
--			<Not><Category>X-KDE-Utilities-File</Category></Not>
--			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
--			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>Accessibility</Name>
--			<Directory>kde-utilities-accessibility.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>Accessibility</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Desktop</Name>
--			<Directory>kde-utilities-desktop.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Desktop</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Menu>
--                        <Name>Editors</Name>
--                        <Directory>kde-editors.directory</Directory>
--                        <Include>
--                                <Category>TextEditor</Category>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>File</Name>
--			<Directory>kde-utilities-file.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-File</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Peripherals</Name>
--			<Directory>kde-utilities-peripherals.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Peripherals</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>PIM</Name>
--			<Directory>kde-utilities-pim.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-PIM</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>XUtilities</Name>
--			<Directory>kde-utilities-xutils.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Include>
--		<And>
--		<Category>KDE</Category>
--		<Category>Core</Category>
--		</And>
--	</Include>
--	<DefaultMergeDirs/>
--	<MergeFile>applications-kmenuedit.menu</MergeFile>
--</Menu>
-diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp
---- kdelibs-3.5.10/kded/kbuildsycoca.cpp	2007-05-14 09:52:43.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp	2009-08-06 06:23:48.000000000 +0200
-@@ -379,7 +379,7 @@
-      connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
-              this, SLOT(slotCreateEntry(const QString &, KService **)));
-              
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
-diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu
---- kdelibs-3.5.10/kded/kde-applications.menu	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-3.5.10.new/kded/kde-applications.menu	2005-09-10 10:27:40.000000000 +0200
-@@ -0,0 +1,469 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+	<Name>Applications</Name>
-+	<Directory>kde-main.directory</Directory>
-+	<!-- Search the default locations -->
-+	<KDELegacyDirs/>
-+	<DefaultAppDirs/>
-+	<DefaultDirectoryDirs/>
-+	<DefaultLayout>
-+		<Merge type="menus"/>
-+		<Merge type="files"/>
-+		<Separator/>
-+		<Menuname>More</Menuname>
-+	</DefaultLayout>
-+	<Layout>
-+		<Merge type="menus"/>
-+		<Menuname>Applications</Menuname>
-+		<Merge type="files"/>
-+	</Layout>
-+
-+	<Menu>
-+		<Name>Applications</Name>
-+		<Directory>kde-unknown.directory</Directory>
-+		<OnlyUnallocated/>
-+		<Include>
-+			<Not>
-+				<!-- Don't list non-KDE core applications -->
-+				<And>
-+					<Category>Core</Category>
-+					<Not><Category>KDE</Category></Not>
-+				</And>
-+				<!-- Don't list SUSE's YaST in here -->
-+				<Category>X-SuSE-YaST</Category>
-+			</Not>
-+		</Include>
-+	</Menu>
-+       <Menu>
-+                <Name>Development</Name>
-+                <Directory>kde-development.directory</Directory>
-+                <Menu>
-+                        <Name>X-KDE-KDevelopIDE</Name>
-+                        <Directory>kde-development-kdevelop.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Development</Category>
-+                                <Category>X-KDE-KDevelopIDE</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>Translation</Name>
-+			<Directory>kde-development-translation.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>Translation</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Web Development</Name>
-+			<Directory>kde-development-webdevelopment.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>WebDevelopment</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Include>
-+                        <And>
-+                        <Category>Development</Category>
-+                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
-+                        <Not><Category>Translation</Category></Not>
-+                        <Not><Category>WebDevelopment</Category></Not>
-+                        </And>
-+                </Include>
-+        </Menu>
-+	<Menu>
-+		<Name>Science</Name>
-+		<Directory>kde-science.directory</Directory>
-+		<Include>
-+			<And><!-- Include /any/ Science app which is not an Education app -->
-+				<Or>
-+					<Category>Astronomy</Category>
-+					<Category>Biology</Category>
-+					<Category>Chemistry</Category>
-+					<Category>Geology</Category>
-+					<Category>MedicalSoftware</Category>
-+					<Category>Physics</Category>
-+					<Category>Math</Category>
-+					<Category>Science</Category>
-+				</Or>
-+				<Not><Category>Education</Category></Not>
-+			</And>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Edutainment</Name>
-+		<Directory>kde-edutainment.directory</Directory>
-+		<Menu>
-+			<Name>Languages</Name>
-+			<Directory>kde-edu-languages.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Mathematics</Name>
-+			<Directory>kde-edu-mathematics.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Math</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Miscellaneous</Name>
-+			<Directory>kde-edu-miscellaneous.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Not>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				<Category>Math</Category>
-+				<Category>Science</Category>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Not>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Science</Name>
-+			<Directory>kde-edu-science.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Science</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Tools</Name>
-+			<Directory>kde-edu-tools.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Games</Name>
-+		<Directory>kde-games.directory</Directory>
-+		<Menu>
-+			<Name>Arcade</Name>
-+			<Directory>kde-games-arcade.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>ArcadeGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Board</Name>
-+			<Directory>kde-games-board.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>BoardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Card</Name>
-+			<Directory>kde-games-card.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>CardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Kidsgames</Name>
-+			<Directory>kde-games-kids.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Or>
-+				<Category>X-KDE-KidsGame</Category>
-+				<Category>KidsGame</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>TacticStrategy</Name>
-+			<Directory>kde-games-strategy.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>StrategyGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Include>
-+			<And>
-+			<Category>Game</Category>
-+			<Not>
-+			<Category>ArcadeGame</Category>
-+			<Category>BoardGame</Category>
-+			<Category>CardGame</Category>
-+			<Category>X-KDE-KidsGame</Category>
-+			<Category>KidsGame</Category>
-+			<Category>StrategyGame</Category>
-+			</Not>
-+			</And>
-+		</Include>
-+               <Menu>
-+                        <Name>Toys</Name>
-+                        <Directory>kde-toys.directory</Directory>
-+                        <Include>
-+                                 <Category>Amusement</Category>
-+                        </Include>
-+               </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Graphics</Name>
-+		<Directory>kde-graphics.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Graphics</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Graphics</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Internet</Name>
-+		<Directory>kde-internet.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Network</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+		  <Name>Terminal</Name>
-+		  <Directory>kde-internet-terminal.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Network</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Multimedia</Name>
-+		<Directory>kde-multimedia.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>AudioVideo</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>AudioVideo</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Office</Name>
-+		<Directory>kde-office.directory</Directory>
-+		<Layout>
-+			<Merge type="menus"/>
-+			<Filename>kde-koshell.desktop</Filename>
-+			<Filename>kde-Kontact.desktop</Filename>
-+			<Separator/>
-+			<Filename>kde-kword.desktop</Filename>
-+			<Filename>kde-kspread.desktop</Filename>
-+			<Filename>kde-kpresenter.desktop</Filename>
-+			<Merge type="files"/>
-+			<Separator/>
-+			<Menuname>More</Menuname>
-+		</Layout>
-+		<Include>
-+                        <And>
-+			<Category>Office</Category>
-+                        <Not><Category>X-KDE-More</Category></Not>
-+                        </And>
-+                </Include>
-+                <Menu>
-+                        <Name>More</Name>
-+                        <Directory>kde-more.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Office</Category>
-+                                <Category>X-KDE-More</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Settingsmenu</Name>
-+		<Directory>kde-settingsmenu.directory</Directory>
-+		<Include>
-+			<Category>Settings</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>System</Name>
-+		<Directory>kde-system.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>System</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>System</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>ScreenSavers</Name>
-+			<Directory>kde-system-screensavers.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>Terminal</Name>
-+			<Directory>kde-system-terminal.directory</Directory>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Utilities</Name>
-+		<Directory>kde-utilities.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Utility</Category>
-+			<Not><Category>Accessibility</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
-+			<Not><Category>X-KDE-Utilities-File</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
-+			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>Accessibility</Name>
-+			<Directory>kde-utilities-accessibility.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>Accessibility</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Desktop</Name>
-+			<Directory>kde-utilities-desktop.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Desktop</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Menu>
-+                        <Name>Editors</Name>
-+                        <Directory>kde-editors.directory</Directory>
-+                        <Include>
-+                                <Category>TextEditor</Category>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>File</Name>
-+			<Directory>kde-utilities-file.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-File</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Peripherals</Name>
-+			<Directory>kde-utilities-peripherals.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Peripherals</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>PIM</Name>
-+			<Directory>kde-utilities-pim.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-PIM</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>XUtilities</Name>
-+			<Directory>kde-utilities-xutils.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Include>
-+		<And>
-+		<Category>KDE</Category>
-+		<Category>Core</Category>
-+		</And>
-+	</Include>
-+	<DefaultMergeDirs/>
-+	<MergeFile>applications-kmenuedit.menu</MergeFile>
-+</Menu>
diff --git a/testing/kdelibs3/kdelibs3-cups16.patch b/testing/kdelibs3/kdelibs3-cups16.patch
deleted file mode 100644
index 6736d49d3..000000000
--- a/testing/kdelibs3/kdelibs3-cups16.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2012-10-06 15:08:17.460612585 -0400
-@@ -629,26 +629,26 @@
- 	cups_lang_t*	lang = cupsLangDefault();
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang));
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language);
--	request_->request.op.operation_id = CUPS_GET_PRINTERS;
-+	ippSetOperation(request_, CUPS_GET_PRINTERS);
- 	request_ = cupsDoRequest(http_, request_, "/printers/");
- 	if (request_)
- 	{
- 		QString	name;
- 		int	type(0);
--		ipp_attribute_t	*attr = request_->attrs;
-+		ipp_attribute_t	*attr = ippFirstAttribute(request_);
- 		while (attr)
- 		{
- 			// check new printer (keep only local non-implicit printers)
--			if (!attr->name)
-+			if (!ippGetName(attr))
- 			{
- 				if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty())
- 					resources_.append(new CupsResource("/printers/"+name));
- 				name = "";
- 				type = 0;
- 			}
--			else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text;
--			else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer;
--			attr = attr->next;
-+			else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL);
-+			else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0);
-+			attr = ippNextAttribute(request_);
- 		}
- 		if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty())
- 			resources_.append(new CupsResource("/printers/"+name));
-@@ -658,26 +658,26 @@
- 	request_ = ippNew();
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang));
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language);
--	request_->request.op.operation_id = CUPS_GET_CLASSES;
-+	ippSetOperation(request_, CUPS_GET_CLASSES);
- 	request_ = cupsDoRequest(http_, request_, "/classes/");
- 	if (request_)
- 	{
- 		QString	name;
- 		int	type(0);
--		ipp_attribute_t	*attr = request_->attrs;
-+		ipp_attribute_t	*attr = ippFirstAttribute(request_);
- 		while (attr)
- 		{
- 			// check new class (keep only local classes)
--			if (!attr->name)
-+			if (!ippGetName(attr))
- 			{
- 				if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty())
- 					resources_.append(new CupsResource("/classes/"+name));
- 				name = "";
- 				type = 0;
- 			}
--			else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text;
--			else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer;
--			attr = attr->next;
-+			else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL);
-+			else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0);
-+			attr = ippNextAttribute(request_);
- 		}
- 		if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty())
- 			resources_.append(new CupsResource("/classes/"+name));
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp	2012-10-06 15:12:00.919127451 -0400
-@@ -51,32 +51,34 @@
- 		kdDebug(500) << "Null request" << endl;
- 		return;
- 	}
--	kdDebug(500) << "State = 0x" << QString::number(req->state, 16) << endl;
--	kdDebug(500) << "ID = 0x" << QString::number(req->request.status.request_id, 16) << endl;
-+	kdDebug(500) << "State = 0x" << QString::number(ippGetState(req), 16) << endl;
-+	kdDebug(500) << "ID = 0x" << QString::number(ippGetRequestId(req), 16) << endl;
- 	if (answer)
- 	{
--		kdDebug(500) << "Status = 0x" << QString::number(req->request.status.status_code, 16) << endl;
--		kdDebug(500) << "Status message = " << ippErrorString(req->request.status.status_code) << endl;
-+		kdDebug(500) << "Status = 0x" << QString::number(ippGetStatusCode(req), 16) << endl;
-+		kdDebug(500) << "Status message = " << ippErrorString(ippGetStatusCode(req)) << endl;
- 	}
- 	else
--		kdDebug(500) << "Operation = 0x" << QString::number(req->request.op.operation_id, 16) << endl;
--	kdDebug(500) << "Version = " << (int)(req->request.status.version[0]) << "." << (int)(req->request.status.version[1]) << endl;
-+		kdDebug(500) << "Operation = 0x" << QString::number(ippGetOperation(req), 16) << endl;
-+	int minorVersion;
-+	int majorVersion = ippGetVersion(req, &minorVersion);
-+	kdDebug(500) << "Version = " << (int)(majorVersion) << "." << (int)(minorVersion) << endl;
- 	kdDebug(500) << endl;
- 
--	ipp_attribute_t *attr = req->attrs;
-+	ipp_attribute_t *attr = ippFirstAttribute(req);
- 	while (attr)
- 	{
--		QString s = QString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16);
--		for (int i=0;i<attr->num_values;i++)
-+		QString s = QString::fromLatin1("%1 (0x%2) = ").arg(ippGetName(attr)).arg(ippGetValueTag(attr), 0, 16);
-+		for (int i=0;i<ippGetCount(attr);i++)
- 		{
--			switch (attr->value_tag)
-+			switch (ippGetValueTag(attr))
- 			{
- 				case IPP_TAG_INTEGER:
- 				case IPP_TAG_ENUM:
--					s += ("0x"+QString::number(attr->values[i].integer, 16));
-+					s += ("0x"+QString::number(ippGetInteger(attr, i), 16));
- 					break;
- 				case IPP_TAG_BOOLEAN:
--					s += (attr->values[i].boolean ? "true" : "false");
-+					s += (ippGetBoolean(attr, i) ? "true" : "false");
- 					break;
- 				case IPP_TAG_STRING:
- 				case IPP_TAG_TEXT:
-@@ -88,16 +90,16 @@
- 				case IPP_TAG_TEXTLANG:
- 				case IPP_TAG_CHARSET:
- 				case IPP_TAG_LANGUAGE:
--					s += attr->values[i].string.text;
-+					s += ippGetString(attr, i, NULL);
- 					break;
- 				default:
- 					break;
- 			}
--			if (i != (attr->num_values-1))
-+			if (i != (ippGetCount(attr)-1))
- 				s += ", ";
- 		}
- 		kdDebug(500) << s << endl;
--		attr = attr->next;
-+		attr = ippNextAttribute(req);
- 	}
- }
- 
-@@ -177,7 +179,7 @@
- 		ipp_attribute_t	*attr = ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,NULL);
- 		int	i(0);
- 		for (QStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].string.text = strdup((*it).local8Bit());
-+			ippSetString(request_, &attr, i, strdup((*it).local8Bit()));
- 	}
- }
- 
-@@ -193,7 +195,7 @@
- 		ipp_attribute_t	*attr = ippAddIntegers(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL);
- 		int	i(0);
- 		for (QValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].integer = *it;
-+			ippSetInteger(request_, &attr, i, *it);
- 	}
- }
- 
-@@ -209,19 +211,19 @@
- 		ipp_attribute_t	*attr = ippAddBooleans(request_,(ipp_tag_t)group,name.latin1(),(int)(values.count()),NULL);
- 		int	i(0);
- 		for (QValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].boolean = (char)(*it);
-+			ippSetBoolean(request_, &attr, i, (char)(*it));
- 	}
- }
- 
- void IppRequest::setOperation(int op)
- {
--	request_->request.op.operation_id = (ipp_op_t)op;
--	request_->request.op.request_id = 1;	// 0 is not RFC-compliant, should be at least 1
-+	ippSetOperation(request_, (ipp_op_t)op);
-+	ippSetRequestId(request_, 1);		// 0 is not RFC-compliant, should be at least 1
- }
- 
- int IppRequest::status()
- {
--	return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2));
-+	return (request_ ? ippGetStatusCode(request_) : (connect_ ? cupsLastError() : -2));
- }
- 
- QString IppRequest::statusMessage()
-@@ -248,7 +250,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type);
- 	if (attr)
- 	{
--		value = attr->values[0].integer;
-+		value = ippGetInteger(attr, 0);
- 		return true;
- 	}
- 	else return false;
-@@ -260,7 +262,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type);
- 	if (attr)
- 	{
--		value = QString::fromLocal8Bit(attr->values[0].string.text);
-+		value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL));
- 		return true;
- 	}
- 	else return false;
-@@ -273,8 +275,8 @@
- 	values.clear();
- 	if (attr)
- 	{
--		for (int i=0;i<attr->num_values;i++)
--			values.append(QString::fromLocal8Bit(attr->values[i].string.text));
-+		for (int i=0;i<ippGetCount(attr);i++)
-+			values.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL)));
- 		return true;
- 	}
- 	else return false;
-@@ -286,7 +288,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), IPP_TAG_BOOLEAN);
- 	if (attr)
- 	{
--		value = (bool)attr->values[0].boolean;
-+		value = (bool)ippGetBoolean(attr, 0);
- 		return true;
- 	}
- 	else return false;
-@@ -338,10 +340,10 @@
- 	}
- 
- 	/* No printers found */
--	if ( request_ && request_->request.status.status_code == 0x406 )
-+	if ( request_ && ippGetStatusCode(request_) == 0x406 )
- 		return true;
- 
--	if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00))
-+	if (!request_ || ippGetState(request_) == IPP_ERROR || (ippGetStatusCode(request_) & 0x0F00))
- 		return false;
- 
- 
-@@ -356,36 +358,36 @@
- 	output << "<tr><th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Attribute") << "</font></th>" << endl;
- 	output << "<th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Values") << "</font></th></tr>" << endl;
- 	// go to the first attribute of the specified group
--	ipp_attribute_t	*attr = request_->attrs;
--	while (attr && attr->group_tag != group)
--		attr = attr->next;
-+	ipp_attribute_t	*attr = ippFirstAttribute(request_);
-+	while (attr && ippGetGroupTag(attr) != group)
-+		attr = ippNextAttribute(request_);
- 	// print each attribute
--	ipp_uchar_t	*d;
--	QCString	dateStr;
--	QDateTime	dt;
--	bool	bg(false);
--	while (attr && attr->group_tag == group)
-+	const ipp_uchar_t	*d;
-+	QCString		dateStr;
-+	QDateTime		dt;
-+	bool			bg(false);
-+	while (attr && ippGetGroupTag(attr) == group)
- 	{
--		output << "  <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n    <td><b>" << attr->name << "</b></td>\n    <td>" << endl;
-+		output << "  <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n    <td><b>" << ippGetName(attr) << "</b></td>\n    <td>" << endl;
- 		bg = !bg;
--		for (int i=0; i<attr->num_values; i++)
-+		for (int i=0; i<ippGetCount(attr); i++)
- 		{
--			switch (attr->value_tag)
-+			switch (ippGetValueTag(attr))
- 			{
- 				case IPP_TAG_INTEGER:
--					if (attr->name && strstr(attr->name, "time"))
-+					if (ippGetName(attr) && strstr(ippGetName(attr), "time"))
- 					{
--						dt.setTime_t((unsigned int)(attr->values[i].integer));
-+						dt.setTime_t((unsigned int)(ippGetInteger(attr, i)));
- 						output << dt.toString();
- 					}
- 					else
--						output << attr->values[i].integer;
-+						output << ippGetInteger(attr, i);
- 					break;
- 				case IPP_TAG_ENUM:
--					output << "0x" << hex << attr->values[i].integer << dec;
-+					output << "0x" << hex << ippGetInteger(attr, i) << dec;
- 					break;
- 				case IPP_TAG_BOOLEAN:
--					output << (attr->values[i].boolean ? i18n("True") : i18n("False"));
-+					output << (ippGetBoolean(attr, i) ? i18n("True") : i18n("False"));
- 					break;
- 				case IPP_TAG_STRING:
- 				case IPP_TAG_TEXTLANG:
-@@ -397,18 +399,25 @@
- 				case IPP_TAG_CHARSET:
- 				case IPP_TAG_LANGUAGE:
- 				case IPP_TAG_MIMETYPE:
--					output << attr->values[i].string.text;
-+					output << ippGetString(attr, i, NULL);
- 					break;
- 				case IPP_TAG_RESOLUTION:
--					output << "( " << attr->values[i].resolution.xres
--					       << ", " << attr->values[i].resolution.yres << " )";
-+					int xres;
-+					int yres;
-+					ipp_res_t units;
-+					xres = ippGetResolution(attr, i, &yres, &units);
-+					output << "( " << xres
-+					       << ", " << yres << " )";
- 					break;
- 				case IPP_TAG_RANGE:
--					output << "[ " << (attr->values[i].range.lower > 0 ? attr->values[i].range.lower : 1)
--					       << ", " << (attr->values[i].range.upper > 0 ? attr->values[i].range.upper : 65535) << " ]";
-+					int lowervalue;
-+					int uppervalue;
-+					lowervalue = ippGetRange(attr, i, &uppervalue);
-+					output << "[ " << (lowervalue > 0 ? lowervalue : 1)
-+					       << ", " << (uppervalue > 0 ? uppervalue : 65535) << " ]";
- 					break;
- 				case IPP_TAG_DATE:
--					d = attr->values[i].date;
-+					d = ippGetDate(attr, i);
- 					dateStr.sprintf("%.4d-%.2d-%.2d, %.2d:%.2d:%.2d %c%.2d%.2d",
- 							d[0]*256+d[1], d[2], d[3],
- 							d[4], d[5], d[6],
-@@ -418,11 +427,11 @@
- 				default:
- 					continue;
- 			}
--			if (i < attr->num_values-1)
-+			if (i < ippGetCount(attr)-1)
- 				output << "<br>";
- 		}
- 		output << "</td>\n  </tr>" << endl;
--		attr = attr->next;
-+		attr = ippNextAttribute(request_);
- 	}
- 	// end table
- 	output << "</table>" << endl;
-@@ -438,31 +447,34 @@
- 		ipp_attribute_t	*attr = first();
- 		while (attr)
- 		{
--			if (group != -1 && attr->group_tag != group)
-+			if (group != -1 && ippGetGroupTag(attr) != group)
- 			{
--				attr = attr->next;
-+				attr = ippNextAttribute(request_);
- 				continue;
- 			}
- 			QString	value;
--			for (int i=0; i<attr->num_values; i++)
-+			for (int i=0; i<ippGetCount(attr); i++)
- 			{
--				switch (attr->value_tag)
-+				switch (ippGetValueTag(attr))
- 				{
- 					case IPP_TAG_INTEGER:
- 					case IPP_TAG_ENUM:
--						value.append(QString::number(attr->values[i].integer)).append(",");
-+						value.append(QString::number(ippGetInteger(attr, i))).append(",");
- 						break;
- 					case IPP_TAG_BOOLEAN:
--						value.append((attr->values[i].boolean ? "true" : "false")).append(",");
-+						value.append((ippGetBoolean(attr, i) ? "true" : "false")).append(",");
- 						break;
- 					case IPP_TAG_RANGE:
--						if (attr->values[i].range.lower > 0)
--							value.append(QString::number(attr->values[i].range.lower));
--						if (attr->values[i].range.lower != attr->values[i].range.upper)
-+						int lowervalue;
-+						int uppervalue;
-+						lowervalue = ippGetRange(attr, i, &uppervalue);
-+						if (lowervalue > 0)
-+							value.append(QString::number(lowervalue));
-+						if (lowervalue != uppervalue)
- 						{
- 							value.append("-");
--							if (attr->values[i].range.upper > 0)
--								value.append(QString::number(attr->values[i].range.upper));
-+							if (uppervalue > 0)
-+								value.append(QString::number(uppervalue));
- 						}
- 						value.append(",");
- 						break;
-@@ -476,7 +488,7 @@
- 					case IPP_TAG_TEXTLANG:
- 					case IPP_TAG_CHARSET:
- 					case IPP_TAG_LANGUAGE:
--						value.append(QString::fromLocal8Bit(attr->values[i].string.text)).append(",");
-+						value.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL))).append(",");
- 						break;
- 					default:
- 						break;
-@@ -484,8 +496,8 @@
- 			}
- 			if (!value.isEmpty())
- 				value.truncate(value.length()-1);
--			opts[QString::fromLocal8Bit(attr->name)] = value;
--			attr = attr->next;
-+			opts[QString::fromLocal8Bit(ippGetName(attr))] = value;
-+			attr = ippNextAttribute(request_);
- 		}
- 	}
- 	return opts;
-@@ -542,3 +554,7 @@
- 	}
- #endif
- }
-+
-+
-+ipp_attribute_t* IppRequest::first()
-+{ return (request_ ? ippFirstAttribute(request_) : NULL); }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h kdelibs-3.5.10/kdeprint/cups/ipprequest.h
---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.h	2012-10-06 15:06:05.581489574 -0400
-@@ -72,7 +72,7 @@
- 	bool keyword(const QString& name, QStringList& value);
- 	bool mime(const QString& name, QString& value);
- 	ipp_attribute_t* first();
--	ipp_attribute_t* last();
-+	ipp_t* request();
- 	QMap<QString,QString> toMap(int group = -1);
- 	void setMap(const QMap<QString,QString>& opts);
- 
-@@ -178,12 +178,6 @@
- inline bool IppRequest::doRequest(const QString& res)
- { return doFileRequest(res); }
- 
--inline ipp_attribute_t* IppRequest::first()
--{ return (request_ ? request_->attrs : NULL); }
--
--inline ipp_attribute_t* IppRequest::last()
--{ return (request_ ? request_->last : NULL); }
--
- inline void IppRequest::setHost(const QString& host)
- { host_ = host; }
- 
-@@ -193,4 +187,7 @@
- inline void IppRequest::dump(int state)
- { dump_ = state; }
- 
-+inline ipp_t* IppRequest::request()
-+{ return request_; }
-+
- #endif
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp	2012-10-06 15:13:31.451859386 -0400
-@@ -36,6 +36,8 @@
- #include <kdebug.h>
- #include <kurl.h>
- 
-+#include "config.h"
-+
- KMCupsJobManager::KMCupsJobManager(QObject *parent, const char *name, const QStringList & /*args*/)
- : KMJobManager(parent,name)
- {
-@@ -166,17 +168,18 @@
- void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr)
- {
- 	ipp_attribute_t	*attr = req.first();
-+	ipp_attribute_t	*nextAttr;
- 	KMJob		*job = new KMJob();
- 	QString		uri;
- 	while (attr)
- 	{
--		QString	name(attr->name);
--		if (name == "job-id") job->setId(attr->values[0].integer);
--		else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(attr->values[0].string.text));
--		else if (name == "job-name") job->setName(QString::fromLocal8Bit(attr->values[0].string.text));
-+		QString	name(ippGetName(attr));
-+		if (name == "job-id") job->setId(ippGetInteger(attr, 0));
-+		else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
-+		else if (name == "job-name") job->setName(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		else if (name == "job-state")
- 		{
--			switch (attr->values[0].integer)
-+			switch (ippGetInteger(attr, 0))
- 			{
- 				case IPP_JOB_PENDING:
- 					job->setState(KMJob::Queued);
-@@ -204,29 +207,30 @@
- 					break;
- 			}
- 		}
--		else if (name == "job-k-octets") job->setSize(attr->values[0].integer);
--		else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(attr->values[0].string.text));
--		else if (name == "job-k-octets-completed") job->setProcessedSize(attr->values[0].integer);
--		else if (name == "job-media-sheets") job->setPages(attr->values[0].integer);
--		else if (name == "job-media-sheets-completed") job->setProcessedPages(attr->values[0].integer);
-+		else if (name == "job-k-octets") job->setSize(ippGetInteger(attr, 0));
-+		else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
-+		else if (name == "job-k-octets-completed") job->setProcessedSize(ippGetInteger(attr, 0));
-+		else if (name == "job-media-sheets") job->setPages(ippGetInteger(attr, 0));
-+		else if (name == "job-media-sheets-completed") job->setProcessedPages(ippGetInteger(attr, 0));
- 		else if (name == "job-printer-uri" && !pr->isRemote())
- 		{
--			QString	str(attr->values[0].string.text);
-+			QString	str(ippGetString(attr, 0, NULL));
- 			int	p = str.findRev('/');
- 			if (p != -1)
- 				job->setPrinter(str.mid(p+1));
- 		}
- 		else if (name == "job-priority")
- 		{
--			job->setAttribute(0, QString::fromLatin1("%1").arg(attr->values[0].integer, 3));
-+			job->setAttribute(0, QString::fromLatin1("%1").arg(ippGetInteger(attr, 0), 3));
- 		}
- 		else if (name == "job-billing")
- 		{
- 			job->setAttributeCount(2);
--			job->setAttribute(1, QString::fromLocal8Bit(attr->values[0].string.text));
-+			job->setAttribute(1, QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		}
- 
--		if (name.isEmpty() || attr == req.last())
-+		nextAttr = ippNextAttribute(req.request());
-+		if (name.isEmpty() || (!nextAttr))
- 		{
- 			if (job->printer().isEmpty())
- 				job->setPrinter(pr->printerName());
-@@ -234,8 +238,7 @@
- 			addJob(job);	// don't use job after this call !!!
- 			job = new KMJob();
- 		}
--
--		attr = attr->next;
-+		attr = nextAttr;
- 	}
- 	delete job;
- }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp	2012-10-06 15:14:22.311521604 -0400
-@@ -476,19 +476,20 @@
- void KMCupsManager::processRequest(IppRequest* req)
- {
- 	ipp_attribute_t	*attr = req->first();
-+	ipp_attribute_t	*nextAttr;
- 	KMPrinter	*printer = new KMPrinter();
- 	while (attr)
- 	{
--		QString	attrname(attr->name);
-+		QString	attrname(ippGetName(attr));
- 		if (attrname == "printer-name")
- 		{
--			QString	value = QString::fromLocal8Bit(attr->values[0].string.text);
-+			QString	value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL));
- 			printer->setName(value);
- 			printer->setPrinterName(value);
- 		}
- 		else if (attrname == "printer-type")
- 		{
--			int	value = attr->values[0].integer;
-+			int	value = ippGetInteger(attr, 0);
- 			printer->setType(0);
- 			printer->addType(((value & CUPS_PRINTER_CLASS) || (value & CUPS_PRINTER_IMPLICIT) ? KMPrinter::Class : KMPrinter::Printer));
- 			if ((value & CUPS_PRINTER_REMOTE)) printer->addType(KMPrinter::Remote);
-@@ -499,7 +500,7 @@
- 		}
- 		else if (attrname == "printer-state")
- 		{
--			switch (attr->values[0].integer)
-+			switch (ippGetInteger(attr, 0))
- 			{
- 				case IPP_PRINTER_IDLE: printer->setState(KMPrinter::Idle); break;
- 				case IPP_PRINTER_PROCESSING: printer->setState(KMPrinter::Processing); break;
-@@ -508,22 +509,24 @@
- 		}
- 		else if (attrname == "printer-uri-supported")
- 		{
--			printer->setUri(KURL(attr->values[0].string.text));
-+			printer->setUri(KURL(ippGetString(attr, 0, NULL)));
- 		}
- 		else if (attrname == "printer-location")
- 		{
--			printer->setLocation(QString::fromLocal8Bit(attr->values[0].string.text));
-+			printer->setLocation(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		}
- 		else if (attrname == "printer-is-accepting-jobs")
- 		{
--			printer->setAcceptJobs(attr->values[0].boolean);
-+			printer->setAcceptJobs(ippGetBoolean(attr, 0));
- 		}
--		if (attrname.isEmpty() || attr == req->last())
-+
-+		nextAttr = ippNextAttribute(req->request());
-+		if (attrname.isEmpty() || (!nextAttr))
- 		{
- 			addPrinter(printer);
- 			printer = new KMPrinter();
- 		}
--		attr = attr->next;
-+		attr = nextAttr;
- 	}
- 	delete printer;
- }
-@@ -817,6 +820,7 @@
- {
- 	QStringList	list;
- 	IppRequest	req;
-+	ipp_attribute_t	*nextAttr;
- 	req.setOperation(CUPS_GET_DEVICES);
- 	if (req.doRequest("/"))
- 	{
-@@ -824,12 +828,13 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			QString	attrname(attr->name);
--			if (attrname == "device-info") desc = attr->values[0].string.text;
--			else if (attrname == "device-make-and-model") printer = attr->values[0].string.text;
--			else if (attrname == "device-uri") uri = attr->values[0].string.text;
--			else if ( attrname == "device-class" ) cl = attr->values[ 0 ].string.text;
--			if (attrname.isEmpty() || attr == req.last())
-+			QString	attrname(ippGetName(attr));
-+			if (attrname == "device-info") desc = ippGetString(attr, 0, NULL);
-+			else if (attrname == "device-make-and-model") printer = ippGetString(attr, 0, NULL);
-+			else if (attrname == "device-uri") uri = ippGetString(attr, 0, NULL);
-+			else if ( attrname == "device-class" ) cl = ippGetString(attr, 0, NULL);
-+			nextAttr = ippNextAttribute(req.request());
-+			if (attrname.isEmpty() || (!nextAttr))
- 			{
- 				if (!uri.isEmpty())
- 				{
-@@ -838,7 +843,7 @@
- 				}
- 				uri = desc = printer = cl = QString::null;
- 			}
--			attr = attr->next;
-+			attr = nextAttr;
- 		}
- 	}
- 	return list;
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp	2012-10-06 15:14:55.177970017 -0400
-@@ -60,6 +60,8 @@
- #include <kaction.h>
- #include <kmessagebox.h>
- 
-+#include "config.h"
-+
- KMCupsUiManager::KMCupsUiManager(QObject *parent, const char *name, const QStringList & /*args*/)
- : KMUiManager(parent,name)
- {
-@@ -143,22 +145,22 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"device-uri") == 0)
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0)
- 			{
--				if (strncmp(attr->values[0].string.text,"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true);
--				else if (strncmp(attr->values[0].string.text,"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"serial",6) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true);
--				else if (strncmp(attr->values[0].string.text,"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true);
--				else if (strncmp(attr->values[0].string.text,"usb",3) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"http",4) == 0 || strncmp(attr->values[0].string.text,"ipp",3) == 0)
-+				if (strncmp(ippGetString(attr, 0, NULL),"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"serial",6) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"usb",3) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"http",4) == 0 || strncmp(ippGetString(attr, 0, NULL),"ipp",3) == 0)
- 				{
- 					backend->enableBackend(KMWizard::IPP,true);
- 					backend->enableBackend(KMWizard::Custom+1,true);
- 				}
--				else if (strncmp(attr->values[0].string.text,"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true);
- 			}
--			attr = attr->next;
-+			attr = ippNextAttribute(req.request());
- 		}
- 		backend->enableBackend(KMWizard::Class, true);
- 		backend->enableBackend(KMWizard::Custom+5, true);
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp	2012-10-06 15:15:28.044418449 -0400
-@@ -30,6 +30,8 @@
- #include <kiconloader.h>
- #include <kurl.h>
- 
-+#include "config.h"
-+
- KMWFax::KMWFax(QWidget *parent, const char *name)
- : KMWizardPage(parent,name)
- {
-@@ -55,11 +57,11 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0)
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0 && strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0)
- 			{
--				m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(attr->values[0].string.text));
-+				m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(ippGetString(attr, 0, NULL)));
- 			}
--			attr = attr->next;
-+			attr = ippNextAttribute(req.request());
- 		}
- 	}
- }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp	2012-10-06 15:15:56.867560417 -0400
-@@ -29,6 +29,8 @@
- #include <kdebug.h>
- #include <kiconloader.h>
- 
-+#include "config.h"
-+
- KMWIppSelect::KMWIppSelect(QWidget *parent, const char *name)
- : KMWizardPage(parent,name)
- {
-@@ -83,9 +85,9 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"printer-name") == 0)
--				m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(attr->values[0].string.text));
--			attr = attr->next;
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"printer-name") == 0)
-+				m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(ippGetString(attr, 0, NULL)));
-+			attr = ippNextAttribute(req.request());
- 		}
- 		m_list->sort();
- 	}
diff --git a/testing/kdelibs3/kdelibs3-missing-include.patch b/testing/kdelibs3/kdelibs3-missing-include.patch
deleted file mode 100644
index 5b84ef746..000000000
--- a/testing/kdelibs3/kdelibs3-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdeprint/cups/cupsdconf2/cups-util.c.old	2012-01-19 01:30:26.000000000 -0500
-+++ kdeprint/cups/cupsdconf2/cups-util.c	2012-01-19 01:31:33.000000000 -0500
-@@ -2,6 +2,7 @@
- #include <cups/http.h>
- #include <cups/cups.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/testing/kdelibs3/kdelibs3.install b/testing/kdelibs3/kdelibs3.install
deleted file mode 100644
index 7291ac0a2..000000000
--- a/testing/kdelibs3/kdelibs3.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
-}
diff --git a/testing/kdelibs3/openssl.patch b/testing/kdelibs3/openssl.patch
deleted file mode 100644
index a948b884a..000000000
--- a/testing/kdelibs3/openssl.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
- static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
-                                    const EVP_CIPHER *,unsigned char *,int ,
-                                             pem_password_cb *, void *) = 0L;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
-+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
-+#else
- static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
- static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
- static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
-+#endif
- static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
- static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
- static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
-@@ -430,9 +435,14 @@ KConfig *cfg;
-       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
-       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
-       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
-+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
-+#else
-       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
-       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
-       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
-+#endif
-       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
-       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
-       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -594,7 +604,7 @@ KConfig *cfg;
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
- #endif
- 
- 
-@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
-    else return -1;
- }
- 
--
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
-+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-+   else return -1;
-+}
-+#else
- ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
-    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
-    else return 0L;
-@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
-         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-    else return -1;
- }
--
-+#endif
- 
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
-    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
-@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
- #include <openssl/stack.h>
- #include <openssl/bn.h>
- #undef crypt
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
- #endif
- 
- #include <kstaticdeleter.h>
-@@ -446,12 +449,12 @@ public:
-     */
-    int PEM_write_bio_X509(BIO *bp, X509 *x);
- 
--
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
-    /*
-     *   X509_asn1_meth - used for netscape output
-     */
-    ASN1_METHOD *X509_asn1_meth();
--
-+#endif
- 
-    /*
-     *   ASN1_i2d_fp - used for netscape output
-@@ -531,6 +534,9 @@ public:
-     */
-    void sk_free(STACK *s);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
- 
-    /* 
-     *  Number of elements in the stack
-@@ -543,6 +549,9 @@ public:
-     */
-    char *sk_value(STACK *s, int n);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
- 
-    /* 
-     *  Create a new stack
-@@ -555,6 +564,9 @@ public:
-     */
-    int sk_push(STACK *s, char *d);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
- 
-    /* 
-     *  Duplicate the stack
-diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
- 
- 
- STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
--    STACK_OF(X509) *x509 = sk_new(NULL);
-+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
-     KSSLCertificate *cert = certs.first();
-     while(cert) {
- 	sk_X509_push(x509, cert->getCert());
-diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -1003,17 +1003,31 @@ return qba;
- QByteArray KSSLCertificate::toNetscape() {
- QByteArray qba;
- #ifdef KSSL_HAVE_SSL
--ASN1_HEADER ah;
--ASN1_OCTET_STRING os;
--KTempFile ktf;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	NETSCAPE_X509 nx;
-+	ASN1_OCTET_STRING hdr;
-+#else
-+   ASN1_HEADER ah;
-+   ASN1_OCTET_STRING os;
-+#endif
-+	KTempFile ktf;
- 
--	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
--	os.length = strlen(NETSCAPE_CERT_HDR);
--	ah.header = &os;
--	ah.data = (char *)getCert();
--	ah.meth = d->kossl->X509_asn1_meth();
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+	hdr.length = strlen(NETSCAPE_CERT_HDR);
-+	nx.header = &hdr;
-+	nx.cert = getCert();
-+
-+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
-+#else
-+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+   os.length = strlen(NETSCAPE_CERT_HDR);
-+   ah.header = &os;
-+   ah.data = (char *)getCert();
-+   ah.meth = d->kossl->X509_asn1_meth();
- 
--	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+#endif
- 
- 	ktf.close();
- 
diff --git a/testing/kdemultimedia-audiocd-kio/PKGBUILD b/testing/kdemultimedia-audiocd-kio/PKGBUILD
deleted file mode 100644
index 16ad5d97b..000000000
--- a/testing/kdemultimedia-audiocd-kio/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167637 2012-10-02 19:48:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-audiocd-kio
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Kioslave for accessing audio CDs"
-url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libkcddb' 'libkcompactdisc' 'lame')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdemultimedia')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('822b2a151cb03cdf2708d3731a07b0fa23ee8e34')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../audiocd-kio-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-dragonplayer/PKGBUILD b/testing/kdemultimedia-dragonplayer/PKGBUILD
deleted file mode 100644
index 20f6a6609..000000000
--- a/testing/kdemultimedia-dragonplayer/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167638 2012-10-02 19:48:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-dragonplayer
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A multimedia player where the focus is on simplicity, instead of
-features"
-url='http://kde.org/applications/multimedia/dragonplayer/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('ebe0021892c76f2b7ffd637ebf035801851ed3b5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../dragon-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-dragonplayer/kdemultimedia-dragonplayer.install b/testing/kdemultimedia-dragonplayer/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdemultimedia-dragonplayer/kdemultimedia-dragonplayer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdemultimedia-ffmpegthumbs/PKGBUILD b/testing/kdemultimedia-ffmpegthumbs/PKGBUILD
deleted file mode 100644
index 3e2b2b6a1..000000000
--- a/testing/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167639 2012-10-02 19:49:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='FFmpeg-based thumbnail creator for video files'
-url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdelibs' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('a0083c2cda9c194663676b70beb6d23dba0d4f1d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ffmpegthumbs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-juk/PKGBUILD b/testing/kdemultimedia-juk/PKGBUILD
deleted file mode 100644
index 11250e22c..000000000
--- a/testing/kdemultimedia-juk/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167640 2012-10-02 19:49:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-juk
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='A jukebox, tagger and music collection manager'
-url='http://kde.org/applications/multimedia/juk/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime' 'taglib')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('64e0c7ea030434cba9bdc9db05901aa81e1aaa97')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../juk-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_TunePimp=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-juk/kdemultimedia-juk.install b/testing/kdemultimedia-juk/kdemultimedia-juk.install
deleted file mode 100644
index c0797237a..000000000
--- a/testing/kdemultimedia-juk/kdemultimedia-juk.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/kdemultimedia-kmix/PKGBUILD b/testing/kdemultimedia-kmix/PKGBUILD
deleted file mode 100644
index d67c720ae..000000000
--- a/testing/kdemultimedia-kmix/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167641 2012-10-02 19:50:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-kmix
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE volume control program"
-url='http://kde.org/applications/multimedia/kmix/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('581955c6a097c69f3cf511a6c55c58d2d2d9ceb7')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmix-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-kmix/kdemultimedia-kmix.install b/testing/kdemultimedia-kmix/kdemultimedia-kmix.install
deleted file mode 100644
index c0797237a..000000000
--- a/testing/kdemultimedia-kmix/kdemultimedia-kmix.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/kdemultimedia-kscd/PKGBUILD b/testing/kdemultimedia-kscd/PKGBUILD
deleted file mode 100644
index 5c666d4ce..000000000
--- a/testing/kdemultimedia-kscd/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167642 2012-10-02 19:50:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-kscd
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE CD player"
-url='http://kde.org/applications/multimedia/kscd/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('9130d1f35713f5ebb2f81a4f1b91f3fe16f18861')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kscd-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-kscd/kdemultimedia-kscd.install b/testing/kdemultimedia-kscd/kdemultimedia-kscd.install
deleted file mode 100644
index c0797237a..000000000
--- a/testing/kdemultimedia-kscd/kdemultimedia-kscd.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/kdemultimedia-mplayerthumbs/PKGBUILD b/testing/kdemultimedia-mplayerthumbs/PKGBUILD
deleted file mode 100644
index b8860085f..000000000
--- a/testing/kdemultimedia-mplayerthumbs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167643 2012-10-02 19:51:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="MPlayer based thumbnail generator for video files"
-url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
-arch=('i686' 'x86_64')
-groups=('kde' 'kdemultimedia')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'mplayer')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('a70d8f522d31529444ba957cdadd97c22dab7090')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../mplayerthumbs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia/PKGBUILD b/testing/kdemultimedia/PKGBUILD
deleted file mode 100644
index 72962105c..000000000
--- a/testing/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 163059 2012-07-06 15:21:31Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
-         'kdemultimedia-ffmpegthumbs'
-         'kdemultimedia-juk'
-         'kdemultimedia-kioslave'
-         'kdemultimedia-kmix'
-         'kdemultimedia-kscd'
-         'kdemultimedia-mplayerthumbs')
-pkgver=4.8.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
-             'libmusicbrainz3' 'taglib' 'libcanberra')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'mplayerthumbs.config'
-        'ffmpeg0.11.patch')
-sha1sums=('dac721e82308a6347d578361e25da7c466a26ba7'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '48331f7e2dab760c20708b81fe6c4d47c83a63e7')
-
-build() {
-    cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs
-    patch -p1 -i ${srcdir}/ffmpeg0.11.patch
-
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_TunePimp=OFF
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia-dragonplayer.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/dragonplayer/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
-	pkgdesc='Video Files (ffmpegthumbs)'
-	depends=('kdebase-runtime' 'ffmpeg')
-	install='kdemultimedia.install'
-	cd $srcdir/build/ffmpegthumbs
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
-	pkgdesc='Music Player'
-    depends=('kdebase-runtime' 'taglib')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/juk/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
-	pkgdesc='Audio CD Browser'
-	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
-	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	for i in kioslave libkcddb libkcompactdisc; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-}
-
-package_kdemultimedia-kmix() {
-	pkgdesc='Sound Mixer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/kmix"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kmix
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/kmix/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
-	pkgdesc='CD Player'
-	depends=('kdebase-runtime' 'libmusicbrainz3')
-	url="http://kde.org/applications/multimedia/kscd"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kscd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
-	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=('kdebase-runtime' 'mplayer')
-	replaces=('mplayerthumbs')
-	conflicts=('mplayerthumbs')
-	cd $srcdir/build/mplayerthumbs
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/testing/kdemultimedia/ffmpeg0.11.patch b/testing/kdemultimedia/ffmpeg0.11.patch
deleted file mode 100644
index 527ac3992..000000000
--- a/testing/kdemultimedia/ffmpeg0.11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Christoph Feck <christoph@maxiom.de>
-Date: Tue, 29 May 2012 13:53:18 +0000
-Subject: Two deprecated calls have been removed from ffmpeg 0.11.
-X-Git-Tag: v4.8.80
-X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&amp;a=commitdiff&amp;h=4f03b20614c122e3e14473d42a000c0bffdce39c
----
-Two deprecated calls have been removed from ffmpeg 0.11.
-
-BUG:300732
----
-
-
---- a/ffmpegthumbnailer/moviedecoder.cpp
-+++ b/ffmpegthumbnailer/moviedecoder.cpp
-@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
- void MovieDecoder::initialize(const QString& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     QFileInfo fileInfo(filename);
- 
--    if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
-+    if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
-         kDebug() <<  "Could not open input file: " << fileInfo.absoluteFilePath();
-         return;
-     }
-
diff --git a/testing/kdemultimedia/kdemultimedia-dragonplayer.install b/testing/kdemultimedia/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdemultimedia/kdemultimedia-dragonplayer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdemultimedia/kdemultimedia.install b/testing/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdemultimedia/kdemultimedia.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/kdemultimedia/mplayerthumbs.config b/testing/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/testing/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/testing/kdenetwork/PKGBUILD b/testing/kdenetwork/PKGBUILD
deleted file mode 100644
index 74b761e2d..000000000
--- a/testing/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 167644 2012-10-02 19:52:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
-         'kdenetwork-kdnssd'
-         'kdenetwork-kget'
-         'kdenetwork-kopete'
-         'kdenetwork-kppp'
-         'kdenetwork-krdc'
-         'kdenetwork-krfb')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
-    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
-    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6779039e5354fae02cf7faa3442385b95befb430')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
-        -DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF \
-        -DWITH_qq=OFF
-	make
-}
-
-package_kdenetwork-filesharing() {
-	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
-	depends=('kdelibs' 'smbclient')
-	install='kdenetwork.install'
-	cd $srcdir/build/filesharing
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
-	pkgdesc='Monitors the network for DNS-SD services'
-	depends=('kdelibs')
-	cd $srcdir/build/kdnssd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
-	pkgdesc='Download Manager'
-	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
-	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork-kget.install'
-	cd $srcdir/build/kget
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kget
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kopete() {
-	pkgdesc='Instant Messenger'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork-kopete.install'
-	cd $srcdir/build/kopete
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
-	pkgdesc='Internet Dial-Up Tool'
-	depends=('kdebase-runtime' 'ppp')
-	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork-kppp.install'
-	cd $srcdir/build/kppp
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kppp
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
-	pkgdesc='Remote Desktop Client'
-	depends=('kdebase-runtime' 'telepathy-qt')
-    optdepends=('libvncserver: VNC support'
-                'rdesktop: RDP support'
-                'kdebase-keditbookmarks: to edit bookmarks')
-	url="http://kde.org/applications/internet/krdc/"
-	cd $srcdir/build/krdc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krdc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
-	pkgdesc='Desktop Sharing'
-	# note on libxdamage:
-	#       not detected by namcap because libgl depends on it
-	#       but nvidia providing libgl does not depend on libxdamage
-	depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
-	cd $srcdir/build/krfb
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krfb
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdenetwork/kdenetwork-kget.install b/testing/kdenetwork/kdenetwork-kget.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdenetwork/kdenetwork-kget.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdenetwork/kdenetwork-kopete.install b/testing/kdenetwork/kdenetwork-kopete.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdenetwork/kdenetwork-kopete.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdenetwork/kdenetwork-kppp.install b/testing/kdenetwork/kdenetwork-kppp.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdenetwork/kdenetwork-kppp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdenetwork/kdenetwork.install b/testing/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdenetwork/kdenetwork.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/kdepim-runtime/PKGBUILD b/testing/kdepim-runtime/PKGBUILD
deleted file mode 100644
index 0a1568b9c..000000000
--- a/testing/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167566 2012-10-02 18:58:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Extends the functionality of kdepim'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepim-runtime'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi')
-makedepends=('cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('4eeef5c706ea786d35ebaddf6c46084cf666680a')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdepim-runtime/kdepim-runtime.install b/testing/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/testing/kdepim-runtime/kdepim-runtime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/PKGBUILD b/testing/kdepim/PKGBUILD
deleted file mode 100644
index ec4dd231f..000000000
--- a/testing/kdepim/PKGBUILD
+++ /dev/null
@@ -1,269 +0,0 @@
-# $Id: PKGBUILD 167645 2012-10-02 19:53:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole'
-         'kdepim-akregator'
-         'kdepim-blogilo'
-         'kdepim-console'
-         'kdepim-kaddressbook'
-         'kdepim-kalarm'
-         'kdepim-kjots'
-         'kdepim-kleopatra'
-         'kdepim-kmail'
-         'kdepim-knode'
-         'kdepim-knotes'
-         'kdepim-kontact'
-         'kdepim-korganizer'
-         'kdepim-kresources'
-         'kdepim-ktimetracker'
-         'kdepim-ktnef'
-         'kdepim-libkdepim')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
-             'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'fix-build.patch')
-sha1sums=('49e33e54e61bc499e54cdcd3470719cb4c22d2be'
-          '974056ad2c3a00b33a8ac9403b369ab636000832')
-
-build() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-build.patch
-    cd ..
-
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDEPIM_BUILD_MOBILE=OFF
-	make
-}
-
-package_kdepim-akonadiconsole() {
-	pkgdesc='Akonadi Management and Debugging Console'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/akonadiconsole
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator() {
-	pkgdesc='A Feed Reader for KDE'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/akregator/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/akregator
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo() {
-	pkgdesc='A KDE Blogging Client'
-	depends=('kdepim-runtime')
-	url="http://kde.org/applications/internet/blogilo/"
-	replaces=('blogilo')
-	conflicts=('blogilo')
-	install='kdepim.install'
-	cd "${srcdir}"/build/blogilo
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/blogilo
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console() {
-	pkgdesc='Command line tool for accessing calendar files'
-	depends=('kdepim-runtime')
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/console
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kabcclient
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/konsolekalendar
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook() {
-	pkgdesc='Contact Manager'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kaddressbook/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kaddressbook
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kaddressbook
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/plugins/kaddressbook
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kalarm() {
-	pkgdesc='Personal Alarm Scheduler'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kalarm/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kalarm
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kalarm
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots() {
-	pkgdesc='Note Taker'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kjots/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kjots
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra() {
-	pkgdesc='Certificate Manager and Unified Crypto GUI'
-	depends=('kdepim-libkdepim')
-    install=kdepim-kleopatra.install
-	url="http://kde.org/applications/utilities/kleopatra/"
-	cd "${srcdir}"/build/kleopatra
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kleopatra
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kwatchgnupg
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
-	pkgdesc='Mail Client'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim-kmail.install'
-	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	           'kdepim-mimelib' 'kdepim-plugins')
-	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	          'kdepim-mimelib' 'kdepim-plugins')
-	for i in kmail doc/kmail kmailcvt archivemailagent backupmail \
-	importwizard ksendemail libksieve messagelist mailfilteragent \
-	mailimporter ontologies kontact/plugins/kmail; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-knode() {
-	pkgdesc='News Reader'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/knode/"
-	install='kdepim-knode.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kioslave/news
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knode
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes() {
-	pkgdesc='Popup Notes'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/knotes/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knotes
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact() {
-	pkgdesc='Personal Information Manager'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kontact/"
-	install='kdepim.install'
-	conflcits=('kdepim-kontactinterfaces')
-	replaces=('kdepim-kontactinterfaces')
-	for i in kontact/src doc/kontact kontact/plugins/summary \
-		kontact/plugins/specialdates doc/kontact-admin; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-korganizer() {
-	pkgdesc='Calendar and Scheduling Program'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/korganizer"
-	install='kdepim-korganizer.install'
-	for i in korganizer doc/korganizer kontact/plugins/korganizer \
-		calendarviews; do
-		cd "${srcdir}"/build/${i} 
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-kresources() {
-	pkgdesc='KDE PIM resources'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	cd "${srcdir}"/build/kresources
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker() {
-	pkgdesc='Personal Time Tracker'
-	depends=('kdepim-kresources')
-	url="http://kde.org/applications/utilities/ktimetracker/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/ktimetracker
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/ktimetracker
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/ktimetracker
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktnef() {
-	pkgdesc='A viewer/extractor for TNEF files'
-	depends=('kdebase-runtime' 'kdepimlibs')
-	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
-    install=kdepim-ktnef.install
-	cd "${srcdir}"/build/ktnef
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/ktnef
-	make DESTDIR="${pkgdir}" install	
-}
-
-package_kdepim-libkdepim() {
-	pkgdesc='Library for KDE PIM'
-	groups=()
-	depends=('kde-agent' 'kdepim-runtime')
-	url='http://pim.kde.org'
-	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	            'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	for i in akonadi_next calendarsupport incidenceeditor-ng \
-	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-	mailcommon messagecomposer messagecore messageviewer icons \
-	strigi-analyzer templateparser plugins/messageviewer \
-	plugins/ktexteditor; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
diff --git a/testing/kdepim/fix-build.patch b/testing/kdepim/fix-build.patch
deleted file mode 100644
index 7060e814f..000000000
--- a/testing/kdepim/fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdepim-4.9.0/kleopatra/CMakeLists.txt~	2012-07-30 08:06:15.031181647 +0000
-+++ kdepim-4.9.0/kleopatra/CMakeLists.txt	2012-07-30 08:07:13.594082584 +0000
-@@ -365,7 +365,7 @@
- endif(KDEPIM_MOBILE_UI)
- 
- add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
--
-+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
- 
- kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
- kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS} )
diff --git a/testing/kdepim/kdepim-kleopatra.install b/testing/kdepim/kdepim-kleopatra.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-kleopatra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/kdepim-kmail.install b/testing/kdepim/kdepim-kmail.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-kmail.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/kdepim-knode.install b/testing/kdepim/kdepim-knode.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-knode.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/kdepim-korganizer.install b/testing/kdepim/kdepim-korganizer.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-korganizer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/kdepim-ktnef.install b/testing/kdepim/kdepim-ktnef.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-ktnef.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdepim/kdepim.install b/testing/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdepim/kdepim.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/kdepimlibs/PKGBUILD b/testing/kdepimlibs/PKGBUILD
deleted file mode 100644
index 7f9ec4275..000000000
--- a/testing/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167561 2012-10-02 18:50:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepimlibs'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('247820f8f8de5bcd66e19c45afc2033e50f0fd01')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdepimlibs/kdepimlibs.install b/testing/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/testing/kdepimlibs/kdepimlibs.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
-}
\ No newline at end of file
diff --git a/testing/kdeplasma-addons/PKGBUILD b/testing/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index 537ad7c72..000000000
--- a/testing/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,628 +0,0 @@
-# $Id: PKGBUILD 167646 2012-10-02 19:55:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeplasma-addons
-pkgname=('kdeplasma-addons-applets-bball'
-         'kdeplasma-addons-applets-binary-clock'
-         'kdeplasma-addons-applets-blackboard'
-         'kdeplasma-addons-applets-bookmarks'
-         'kdeplasma-addons-applets-bubblemon'
-         'kdeplasma-addons-applets-calculator'
-         'kdeplasma-addons-applets-charselect'
-         'kdeplasma-addons-applets-comic'
-         'kdeplasma-addons-applets-community'
-         'kdeplasma-addons-applets-dict'
-         'kdeplasma-addons-applets-eyes'
-         'kdeplasma-addons-applets-fifteenpuzzle'
-         'kdeplasma-addons-applets-filewatcher'
-         'kdeplasma-addons-applets-frame'
-         'kdeplasma-addons-applets-fuzzy-clock'
-         'kdeplasma-addons-applets-icontasks'
-         'kdeplasma-addons-applets-incomingmsg'
-         'kdeplasma-addons-applets-kdeobservatory'
-         'kdeplasma-addons-applets-kimpanel'
-         'kdeplasma-addons-applets-knowledgebase'
-         'kdeplasma-addons-applets-kolourpicker'
-         'kdeplasma-addons-applets-konqprofiles'
-         'kdeplasma-addons-applets-konsoleprofiles'
-         'kdeplasma-addons-applets-lancelot'
-         'kdeplasma-addons-applets-leavenote'
-         'kdeplasma-addons-applets-life'
-         'kdeplasma-addons-applets-luna'
-         'kdeplasma-addons-applets-magnifique'
-         'kdeplasma-addons-applets-mediaplayer'
-         'kdeplasma-addons-applets-microblog'
-         'kdeplasma-addons-applets-news'
-         'kdeplasma-addons-applets-notes'
-         'kdeplasma-addons-applets-nowplaying'
-         'kdeplasma-addons-applets-paste'
-         'kdeplasma-addons-applets-pastebin'
-         'kdeplasma-addons-applets-plasmaboard'
-         'kdeplasma-addons-applets-previewer'
-         'kdeplasma-addons-applets-qalculate'
-         'kdeplasma-addons-applets-rememberthemilk'
-         'kdeplasma-addons-applets-rssnow'
-         'kdeplasma-addons-applets-showdashboard'
-         'kdeplasma-addons-applets-showdesktop'
-         'kdeplasma-addons-applets-social-news'
-         'kdeplasma-addons-applets-spellcheck'
-         'kdeplasma-addons-applets-systemloadviewer'
-         'kdeplasma-addons-applets-timer'
-         'kdeplasma-addons-applets-unitconverter'
-         'kdeplasma-addons-applets-weather'
-         'kdeplasma-addons-applets-weatherstation'
-         'kdeplasma-addons-applets-webslice'
-         'kdeplasma-addons-containments'
-         'kdeplasma-addons-libs'
-         'kdeplasma-addons-runners-audioplayercontrol'
-         'kdeplasma-addons-runners-browserhistory'
-         'kdeplasma-addons-runners-characters'
-         'kdeplasma-addons-runners-contacts'
-         'kdeplasma-addons-runners-converter'
-         'kdeplasma-addons-runners-datetime'
-         'kdeplasma-addons-runners-events'
-         'kdeplasma-addons-runners-katesessions'
-         'kdeplasma-addons-runners-konquerorsessions'
-         'kdeplasma-addons-runners-konsolesessions'
-         'kdeplasma-addons-runners-kopete'
-         'kdeplasma-addons-runners-mediawiki'
-         'kdeplasma-addons-runners-spellchecker'
-         'kdeplasma-addons-runners-youtube'
-         'kdeplasma-addons-wallpapers-mandelbrot'
-         'kdeplasma-addons-wallpapers-marble'
-         'kdeplasma-addons-wallpapers-pattern'
-         'kdeplasma-addons-wallpapers-potd'
-         'kdeplasma-addons-wallpapers-virus'
-         'kdeplasma-addons-wallpapers-weather')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-groups=('kde' 'kdeplasma-addons')
-makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
-             'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('9f6493d52beb2ed723038e60f5f9ab53beec4e44')
-
-build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeplasma-addons-applets-bball() {
-	pkgdesc='A bouncy ball for plasma'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.install'
-	cd $srcdir/build/applets/bball
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-binary-clock() {
-	pkgdesc='Time displayed in binary format'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/binary-clock
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-blackboard() {
-	pkgdesc='Black Board'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/blackboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bookmarks() {
-	pkgdesc='Quick Access to the Bookmarks'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/bookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bubblemon() {
-	pkgdesc='A pretty bubble that monitors your system.'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/bubblemon
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-calculator() {
-	pkgdesc='Calculate simple sums'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/calculator
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-charselect() {
-	pkgdesc='View, select, and copy characters from a font collection'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/charselect
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-comic() {
-	pkgdesc='View comic strips from the Internet'
-	depends=('kdeplasma-addons-libs')
-	cd $srcdir/build/applets/comic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-community() {
-	pkgdesc='Communicate using the Social Desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/community
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-dict() {
-	pkgdesc='Look up the meaning of words and their translation into different languages'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/dict
-	make DESTDIR=$pkgdir install
-	# FIXME
-	# /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
-	rm -rf $pkgdir/usr/share/icons
-}
-
-package_kdeplasma-addons-applets-eyes() {
-	pkgdesc='XEyes clone'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.install'
-	cd $srcdir/build/applets/eyes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fifteenpuzzle() {
-	pkgdesc='Put the pieces in order'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.install'
-	cd $srcdir/build/applets/fifteenPuzzle
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-filewatcher() {
-	pkgdesc='Watch for changes in specified files'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/fileWatcher
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-frame() {
-	pkgdesc='Display your favorite pictures'
-	depends=('kdebase-workspace' 'libkexiv2')
-	cd $srcdir/build/applets/frame
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fuzzy-clock() {
-	pkgdesc='Time displayed in a less precise format'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/fuzzy-clock
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-icontasks() {
-        pkgdesc='Switch between running applications'
-        depends=('kdebase-workspace')
-        cd $srcdir/build/applets/icontasks
-        make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-incomingmsg() {
-	pkgdesc='Notification of new messages'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/incomingmsg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kdeobservatory() {
-	pkgdesc='Visualize the KDE ecosystem'
-	depends=('kdeplasma-addons-libs' 'qwt')
-	install='kdeplasma-addons.install'
-	cd $srcdir/build/applets/kdeobservatory
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kimpanel() {
-	pkgdesc='A generic input method panel for Oriental languages'
-	depends=('kdeplasma-addons-libs')
-	optdepends=('scim: SCIM backend'
-		        'fcitx: FCITX backend'
-                'ibus: IBUS backend')
-	cd $srcdir/build/applets/kimpanel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-knowledgebase() {
-	pkgdesc='Opendesktop Knowledgebase'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/knowledgebase
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kolourpicker() {
-	pkgdesc='Pick a color from the desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/kolourpicker
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konqprofiles() {
-	pkgdesc='List and launch Konqueror profiles'
-	depends=('kdebase-konqueror' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/konqprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
-	pkgdesc='List and launch Konsole profiles'
-	depends=('kdebase-konsole' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/konsoleprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-lancelot() {
-	pkgdesc='Launcher to start applications'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	replaces=('lancelot')
-	provides=('lancelot')
-	conflicts=('lancelot')
-	install='kdeplasma-addons-applets-lancelot.install'
-	cd $srcdir/build/applets/lancelot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-leavenote() {
-	pkgdesc='Leave notes for users while they are away'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/leavenote
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-life() {
-	pkgdesc='Life'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.install'
-	cd $srcdir/build/applets/life
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-luna() {
-	pkgdesc='Display moon phases for your location'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.install'
-	cd $srcdir/build/applets/luna
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-magnifique() {
-	pkgdesc='A magnification glass for the Plasma desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/magnifique
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-mediaplayer() {
-	pkgdesc='Widget that can play video and sound'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/mediaplayer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-microblog() {
-	pkgdesc='Update and view your microblog status.'
-	depends=('kdeplasma-addons-libs' 'qoauth' 'qca-ossl')
-	cd $srcdir/build/applets/microblog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-news() {
-	pkgdesc='Show news from various sources'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/news
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-notes() {
-	pkgdesc='Desktop sticky notes'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/notes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-nowplaying() {
-	pkgdesc='Displays currently playing audio'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/nowplaying
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-paste() {
-	pkgdesc='Paste text snippets'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/paste
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-pastebin() {
-	pkgdesc='Paste text/images to a remote server'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/pastebin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-plasmaboard() {
-	pkgdesc='A virtual, on-screen keyboard'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/plasmaboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-previewer() {
-	pkgdesc='Preview This File'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.install'
-	cd $srcdir/build/applets/previewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-qalculate() {
-	pkgdesc='A powerful mathematical equation solver'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.install'
-	cd $srcdir/build/applets/qalculate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
-	pkgdesc='Remember The Milk Todo list applet'
-	depends=('kdeplasma-addons-libs')
-	cd $srcdir/build/applets/rememberthemilk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rssnow() {
-	pkgdesc='Show news from various sources'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/rssnow
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdashboard() {
-	pkgdesc='Show the Plasma widget dashboard above other windows'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/showdashboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdesktop() {
-	pkgdesc='Show the Plasma desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/showdesktop
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-social-news() {
-	pkgdesc='Stay informed with the Social Desktop'
-	replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
-	conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
-	depends=('kdeplasma-addons-libs')
-	cd $srcdir/build/applets/social-news
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-spellcheck() {
-	pkgdesc='Fast spell checking'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/spellcheck
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-systemloadviewer() {
-	pkgdesc='Tiny CPU/RAM/Swap monitor'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/systemloadviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-timer() {
-	pkgdesc='Countdown over a specified time period'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/timer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-unitconverter() {
-	pkgdesc='Plasmoid for converting units'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/unitconverter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weather() {
-	pkgdesc='Displays Weather information'
-	depends=('kdeplasma-addons-libs')
-	cd $srcdir/build/applets/weather
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weatherstation() {
-	pkgdesc='Weather reports with an LCD display style'
-	depends=('kdeplasma-addons-libs')
-	cd $srcdir/build/applets/weatherstation
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-webslice() {
-	pkgdesc='Show a part of a webpage'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/webslice
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-containments() {
-	pkgdesc='Activities types for Plasma shells'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/containments
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-libs() {
-	pkgdesc='Plasma Addon Library'
-	depends=('kdebase-workspace')
-	groups=()
-	replaces=('kdeplasma-addons-dataengines')
-	provides=('kdeplasma-addons-dataengines')
-	conflicts=('kdeplasma-addons-dataengines')
-	cd $srcdir/build/libs
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dataengines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-audioplayercontrol() {
-	pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/audioplayercontrol
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-browserhistory() {
-	pkgdesc='Searches in Konqueror´s history'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/browserhistory
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-characters() {
-	pkgdesc='special Characters'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/characters
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-contacts() {
-	pkgdesc='Finds entries in your address book'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/contacts
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-converter() {
-	pkgdesc='Convert values to different units'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/converter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-datetime() {
-	pkgdesc='The current date and time, locally or in any timezone'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/datetime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-events() {
-	pkgdesc='Calendar Events runner'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/events
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-katesessions() {
-	pkgdesc='Matches Kate Sessions'
-	depends=('kdebase-workspace' 'kdesdk-kate')
-	cd $srcdir/build/runners/katesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
-	pkgdesc='Matches Konqueror Sessions'
-	depends=('kdebase-workspace' 'kdebase-konqueror')
-	cd $srcdir/build/runners/konquerorsessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
-	pkgdesc='Matches Konsole Sessions'
-	depends=('kdebase-workspace' 'kdebase-konsole')
-	cd $srcdir/build/runners/konsolesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
-	pkgdesc='Kopete Contact runner'
-	depends=('kdebase-workspace' 'kdenetwork-kopete')
-	cd $srcdir/build/runners/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-mediawiki() {
-	pkgdesc='Search on Wikitravel'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/mediawiki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-spellchecker() {
-	pkgdesc='Check the spelling of a word'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/spellchecker
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-youtube() {
-	pkgdesc='Matches YouTube queries'
-	depends=('kdebase-workspace' 'qjson')
-    install='kdeplasma-addons.install'
-	cd $srcdir/build/runners/youtube
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-mandelbrot() {
-	pkgdesc='Mandelbrot'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/mandelbrot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-marble() {
-	pkgdesc='Globe'
-	depends=('kdebase-workspace' 'kdeedu-marble')
-	cd $srcdir/build/wallpapers/marble
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-pattern() {
-	pkgdesc='Pattern'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/pattern
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-potd() {
-        pkgdesc='Picture of the Day'
-        depends=('kdeplasma-addons-libs')
-        cd $srcdir/build/wallpapers/potd
-        make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-virus() {
-	pkgdesc='Virus'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/virus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-weather() {
-	pkgdesc='Weather'
-	depends=('kdeplasma-addons-libs')
-	cd $srcdir/build/wallpapers/weather
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.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/kdeplasma-addons/kdeplasma-addons.install b/testing/kdeplasma-addons/kdeplasma-addons.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/testing/kdeplasma-addons/kdeplasma-addons.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
-}
\ No newline at end of file
diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
deleted file mode 100644
index c21b8db89..000000000
--- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
-
-pkgname=kdeplasma-applets-networkmanagement
-epoch=1
-pkgver=0.9.0.4
-pkgrel=1
-pkgdesc="KDE control panel and widget network connections"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/extragear/base/networkmanagement'
-license=('GPL')
-depends=('kdebase-workspace' 'networkmanager')
-makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info'
-             'openconnect')
-optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers'
-            'openconnect: Cisco AnyConnect compatible VPN client')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha256sums=('520d0592171ce1aa1c54916f408e7f2d1e016da0acefc725f7170b67a292e256')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../networkmanagement-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdesdk-kate/PKGBUILD b/testing/kdesdk-kate/PKGBUILD
deleted file mode 100644
index 5b573829c..000000000
--- a/testing/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 167570 2012-10-02 19:01:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-katepart'
-         'kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('d3a1f58a5207b305e62a2a3dc7a34802289be42e'
-          '0a928253bd2077f0264d96a6c8823c69c47b6a8d')
-
-build() {
-  cd "${srcdir}"/kate-${pkgver}
-  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kate-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package_kdebase-katepart() {
-  pkgdesc="A fast and feature-rich text editor component"
-  depends=('kdelibs')
-  url="http://kate-editor.org/about-katepart/"
-  install='kdebase-katepart.install'
-
-  cd "${srcdir}"/build/part
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  groups=('kde' 'kdebase')
-  url="http://www.kde.org/applications/utilities/kwrite/"
-  install='kdebase-kwrite.install'
-
-  cd "${srcdir}"/build/kwrite
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  groups=('kde' 'kdesdk')
-  url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-  optdepends=('kdebase-konsole: open a terminal in Kate')
-
-  cd "${srcdir}"/build/kate
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kate
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdesdk-kate/kdebase-katepart.install b/testing/kdesdk-kate/kdebase-katepart.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdesdk-kate/kdebase-katepart.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/kdesdk-kate/kdebase-kwrite.install b/testing/kdesdk-kate/kdebase-kwrite.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdesdk-kate/kdebase-kwrite.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdesdk-kate/kdesdk-kate.install b/testing/kdesdk-kate/kdesdk-kate.install
deleted file mode 100644
index 0446d161b..000000000
--- a/testing/kdesdk-kate/kdesdk-kate.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-    update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch b/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch
deleted file mode 100644
index 27729d1ad..000000000
--- a/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kate-4.7.80/part/syntax/data/bash.xml~	2011-11-20 06:14:30.581097154 +0000
-+++ kate-4.7.80/part/syntax/data/bash.xml	2011-11-20 06:14:45.494553146 +0000
-@@ -8,7 +8,7 @@
-         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
-         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/testing/kdesdk/PKGBUILD b/testing/kdesdk/PKGBUILD
deleted file mode 100644
index 2bf20fe0e..000000000
--- a/testing/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,248 +0,0 @@
-# $Id: PKGBUILD 167647 2012-10-02 19:56:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdesdk
-pkgname=('kdesdk-cervisia'
-         'kdesdk-dolphin-plugins'
-         'kdesdk-kapptemplate'
-         'kdesdk-kcachegrind'
-         'kdesdk-kioslave'
-         'kdesdk-kmtrace'
-         'kdesdk-kompare'
-         'kdesdk-kpartloader'
-         'kdesdk-kprofilemethod'
-         'kdesdk-kstartperf'
-         'kdesdk-kuiviewer'
-         'kdesdk-lokalize'
-         'kdesdk-okteta'
-         'kdesdk-poxml'
-         'kdesdk-scripts'
-         'kdesdk-strigi-analyzer'
-         'kdesdk-umbrello')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
-             'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'fix-python2-path.patch')
-sha1sums=('8acefc3701f12834b1e5606b635aef4b500e0aee'
-          '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# Fix hardcoded python2 cmd
-	patch -Np1 -i ${srcdir}/fix-python2-path.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdesdk-cervisia() {
-	pkgdesc='CVS Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/cervisia/"
-	install='kdesdk-cervisia.install'
-	cd $srcdir/build/cervisia
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cervisia
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dolphin-plugins() {
-	pkgdesc='Extra Dolphin plugins'
-	depends=('kdebase-dolphin')
-    optdepends=('bzr: bazaar support'
-                'git: git support'
-                'mercurial: hg support'
-                'subversion: svn support')
-	install='kdesdk.install'
-    for i in bazaar git hg svn; do
-        cd $srcdir/build/dolphin-plugins/$i
-    	make DESTDIR=$pkgdir install
-    done
-}
-
-package_kdesdk-kapptemplate() {
-	pkgdesc='KDE Template Generator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kapptemplate/"
-	install='kdesdk.install'
-	cd $srcdir/build/kapptemplate
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapptemplate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kcachegrind() {
-	pkgdesc='Visualization of Performance Profiling Data'
-	depends=('kdebase-runtime' 'python2')
-	optdepends=('php: PHP support')
-	url="http://kde.org/applications/development/kcachegrind/"
-	install='kdesdk-kcachegrind.install'
-	cd $srcdir/build/kcachegrind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcachegrind
-	make DESTDIR=$pkgdir install
-
-        # Fix python 2 path
-        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-                "${pkgdir}"/usr/bin/hotshot2calltree
-}
-
-package_kdesdk-kioslave() {
-	pkgdesc='KDED Subversion Module'
-	depends=('kdebase-runtime' 'subversion')
-        install='kdesdk.install'
-	cd $srcdir/build/kioslave
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
-	pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kmtrace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmtrace
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kompare() {
-	pkgdesc='Diff/Patch Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kompare/"
-	install='kdesdk-kompare.install'
-	cd $srcdir/build/kompare
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kompare
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
-	pkgdesc='A test application for KParts'
-	depends=('kdebase-runtime')
-	install='kdesdk.install'
-	cd $srcdir/build/kpartloader
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
-	pkgdesc='Macros helping to profile'
-	cd $srcdir/build/kprofilemethod
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kspy() {
-	pkgdesc='An Object Inspector for Qt/KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kspy
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
-	pkgdesc='Startup time measurement tool for KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kstartperf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
-	pkgdesc='Qt Designer UI File Viewer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kuiviewer/"
-	install='kdesdk-kuiviewer.install'
-	cd $srcdir/build/kuiviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
-	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python2')
-	url="http://kde.org/applications/development/lokalize/"
-	optdepends=('translate-toolkit: enable extra python script')
-	install='kdesdk-lokalize.install'
-	cd $srcdir/build/lokalize
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lokalize
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
-}
-
-package_kdesdk-okteta() {
-	pkgdesc='Hex Editor'
-	depends=('kdebase-runtime')
-	replaces=('kdeutils-okteta')
-	conflicts=('kdeutils-okteta')
-	url="http://kde.org/applications/utilities/okteta/"
-	install='kdesdk-okteta.install'
-	cd $srcdir/build/okteta
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/okteta
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-poxml() {
-	pkgdesc='Translates DocBook XML files using gettext po files'
-	depends=('qt' 'antlr2')
-	cd $srcdir/build/poxml
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/poxml
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scheck() {
-	pkgdesc='An interface style to highlight accel and style guide conflicts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/scheck
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scripts() {
-	pkgdesc='KDE SDK scripts'
-	depends=('python2')
-	cd $srcdir/build/scripts
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/scripts
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/kde-systemsettings-tree.py
-  sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{{kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header}
-}
-
-package_kdesdk-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE SDK'
-	depends=('kdelibs')
-	cd $srcdir/build/strigi-analyzer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-umbrello() {
-	pkgdesc='UML Modeller'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/umbrello/"
-	install='kdesdk-umbrello.install'
-	cd $srcdir/build/umbrello
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/umbrello
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
-}
diff --git a/testing/kdesdk/fix-python2-path.patch b/testing/kdesdk/fix-python2-path.patch
deleted file mode 100644
index 720487031..000000000
--- a/testing/kdesdk/fix-python2-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~	2010-11-24 11:22:42.120000002 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py	2010-11-24 11:22:42.146666670 +0100
-@@ -114,7 +114,7 @@
-         print >>sys.stderr, "Execution failed:", e
- 
-     cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname)
--    if os.name!='nt': cmd='python '+cmd
-+    if os.name!='nt': cmd='python2 '+cmd
-     else: cmd=cmd.replace('/','\\')
-     os.system(cmd)
-
---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~	2010-11-24 11:24:10.853333336 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py	2010-11-24 11:24:10.883333336 +0100
-@@ -42,7 +42,7 @@
-     xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf)
- 
-     ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0]
--    os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-+    os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
- 
- try: convert()
- except: print 'error occured'
---- kdesdk-4.5.80/scripts/svn2log.sh~	2010-11-24 11:46:24.863333337 +0100
-+++ kdesdk-4.5.80/scripts/svn2log.sh	2010-11-24 11:46:24.896666669 +0100
-@@ -17,6 +17,6 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
- 
- echo "Creating changelog...";
--svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
- 
- rm /tmp/accounts.$PPID
\ No newline at end of file
diff --git a/testing/kdesdk/kdesdk-cervisia.install b/testing/kdesdk/kdesdk-cervisia.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-cervisia.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-kcachegrind.install b/testing/kdesdk/kdesdk-kcachegrind.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-kcachegrind.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-kompare.install b/testing/kdesdk/kdesdk-kompare.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-kompare.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-kuiviewer.install b/testing/kdesdk/kdesdk-kuiviewer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-kuiviewer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-lokalize.install b/testing/kdesdk/kdesdk-lokalize.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-lokalize.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk-okteta.install b/testing/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/testing/kdesdk/kdesdk-okteta.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
-}
diff --git a/testing/kdesdk/kdesdk-umbrello.install b/testing/kdesdk/kdesdk-umbrello.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdesdk/kdesdk-umbrello.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdesdk/kdesdk.install b/testing/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdesdk/kdesdk.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/kdetoys/PKGBUILD b/testing/kdetoys/PKGBUILD
deleted file mode 100644
index ae3da75ec..000000000
--- a/testing/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 167648 2012-10-02 19:57:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('fe26e217edb2bc88ee3510bbe2fd32c3acd941b6')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdetoys-amor() {
-	pkgdesc='On-Screen Creature'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/amor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/amor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
-	pkgdesc='Tea Cooker'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/kteatime
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kteatime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
-	pkgdesc='KTux'
-	depends=('kdebase-workspace' )
-	install='kdetoys.install'
-	cd $srcdir/build/ktux
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdetoys/kdetoys.install b/testing/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdetoys/kdetoys.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/kdeutils-filelight/PKGBUILD b/testing/kdeutils-filelight/PKGBUILD
deleted file mode 100644
index ab6e396df..000000000
--- a/testing/kdeutils-filelight/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 167650 2012-10-02 19:58:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-filelight
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='View disk usage information'
-url='http://kde.org/applications/utilities/filelight'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-replaces=('filelight')
-conflicts=('filelight')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz")
-sha1sums=('f1d4c7604fb94a4bbe36e136955dd5f6f0f1fdf1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../filelight-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-filelight/kdeutils-filelight.install b/testing/kdeutils-filelight/kdeutils-filelight.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeutils-filelight/kdeutils-filelight.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kcalc/PKGBUILD b/testing/kdeutils-kcalc/PKGBUILD
deleted file mode 100644
index 0e3053cc5..000000000
--- a/testing/kdeutils-kcalc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167651 2012-10-02 19:58:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcalc
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Scientific Calculator'
-url='http://kde.org/applications/utilities/kcalc/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('f28ed638e433c26e43c7e57e0193cdec67de9f22')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcalc-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kcalc/kdeutils-kcalc.install b/testing/kdeutils-kcalc/kdeutils-kcalc.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils-kcalc/kdeutils-kcalc.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/kdeutils-kcharselect/PKGBUILD b/testing/kdeutils-kcharselect/PKGBUILD
deleted file mode 100644
index 795c80eb0..000000000
--- a/testing/kdeutils-kcharselect/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167652 2012-10-02 19:59:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcharselect
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Character Selector'
-url="http://kde.org/applications/utilities/kcharselect/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz")
-sha1sums=('77f9077f2ec75de8f764140306c63c1a79888d33')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcharselect-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kdf/PKGBUILD b/testing/kdeutils-kdf/PKGBUILD
deleted file mode 100644
index 6fc8c65d2..000000000
--- a/testing/kdeutils-kdf/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167653 2012-10-02 19:59:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kdf
-pkgver=4.9.2
-pkgrel=1
-url="http://kde.org/applications/system/kdiskfree/"
-arch=('i686' 'x86_64')
-pkgdesc='View Disk Usage'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz")
-sha1sums=('022151b4f2170411037be31d2bbf9ce26f003313')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kdf-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kdf/kdeutils-kdf.install b/testing/kdeutils-kdf/kdeutils-kdf.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils-kdf/kdeutils-kdf.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/kdeutils-kfloppy/PKGBUILD b/testing/kdeutils-kfloppy/PKGBUILD
deleted file mode 100644
index 3318061af..000000000
--- a/testing/kdeutils-kfloppy/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167654 2012-10-02 20:00:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kfloppy
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Floppy Formatter'
-url='http://kde.org/applications/utilities/kfloppy/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz")
-sha1sums=('dbf5ceed22cd0ef0d898dacc466ea6db3da7c980')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kfloppy-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kfloppy/kdeutils-kfloppy.install b/testing/kdeutils-kfloppy/kdeutils-kfloppy.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeutils-kfloppy/kdeutils-kfloppy.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kgpg/PKGBUILD b/testing/kdeutils-kgpg/PKGBUILD
deleted file mode 100644
index ea91e24f5..000000000
--- a/testing/kdeutils-kgpg/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167655 2012-10-02 20:00:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kgpg
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='A GnuPG frontend'
-url='http://kde.org/applications/utilities/kgpg/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('2ec3ceb0d623ce1c2345025292a8a3c2e6b9923a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgpg-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kgpg/kdeutils-kgpg.install b/testing/kdeutils-kgpg/kdeutils-kgpg.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeutils-kgpg/kdeutils-kgpg.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-kremotecontrol/PKGBUILD b/testing/kdeutils-kremotecontrol/PKGBUILD
deleted file mode 100644
index 41814687c..000000000
--- a/testing/kdeutils-kremotecontrol/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kremotecontrol
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Configure your remote controls for use with applications'
-url='http://kde.org/applications/utilities/kremotecontrol/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-replaces=('kdeutils-kdelirc')
-conflicts=('kdeutils-kdelirc')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz")
-sha1sums=('142a28d72f07690a5b342c554493fcfb2e7ae6b5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kremotecontrol-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install b/testing/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils-kremotecontrol/kdeutils-kremotecontrol.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/kdeutils-ktimer/PKGBUILD b/testing/kdeutils-ktimer/PKGBUILD
deleted file mode 100644
index 4af12e689..000000000
--- a/testing/kdeutils-ktimer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167657 2012-10-02 20:01:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ktimer
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Countdown Launcher'
-url='http://kde.org/applications/utilities/ktimer/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz")
-sha1sums=('e621ca273d1cb2490f9212f3c2ecf8d57a6efdd3')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktimer-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-ktimer/kdeutils-ktimer.install b/testing/kdeutils-ktimer/kdeutils-ktimer.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeutils-ktimer/kdeutils-ktimer.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/kdeutils-kwallet/PKGBUILD b/testing/kdeutils-kwallet/PKGBUILD
deleted file mode 100644
index afcab8751..000000000
--- a/testing/kdeutils-kwallet/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167658 2012-10-02 20:02:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kwallet
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Wallet Management Tool'
-url='http://kde.org/applications/system/kwalletmanager/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz")
-sha1sums=('e77e2cbf91f14e95ccd45fb1931df274f6c68cc7')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kwallet-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-kwallet/kdeutils-kwallet.install b/testing/kdeutils-kwallet/kdeutils-kwallet.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdeutils-kwallet/kdeutils-kwallet.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdeutils-superkaramba/PKGBUILD b/testing/kdeutils-superkaramba/PKGBUILD
deleted file mode 100644
index 989fa6fc1..000000000
--- a/testing/kdeutils-superkaramba/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167660 2012-10-02 20:03:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-superkaramba
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='An engine for cool desktop eyecandy'
-url='http://kde.org/applications/utilities/superkaramba/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'qimageblitz')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz")
-sha1sums=('3e2e42316fe7ac357c58fbfa1e1387c347c31b30')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../superkaramba-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdeutils-superkaramba/kdeutils-superkaramba.install b/testing/kdeutils-superkaramba/kdeutils-superkaramba.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeutils-superkaramba/kdeutils-superkaramba.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeutils-sweeper/PKGBUILD b/testing/kdeutils-sweeper/PKGBUILD
deleted file mode 100644
index 24004390c..000000000
--- a/testing/kdeutils-sweeper/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167661 2012-10-02 20:03:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-sweeper
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='System Cleaner'
-url='http://kde.org/applications/utilities/sweeper'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz")
-sha1sums=('31732ac3dd0be4864f6db9a7810b67a1634fc57d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../sweeper-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdevelop-php/PKGBUILD b/testing/kdevelop-php/PKGBUILD
deleted file mode 100644
index 11d184b2a..000000000
--- a/testing/kdevelop-php/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 166545 2012-09-10 13:09:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdevelop-php
-pkgver=1.3.90
-_pkgver=4.3.90
-pkgrel=1
-pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
-arch=('i686' 'x86_64')
-url="http://www.kdevelop.org/"
-license=('GPL')
-depends=('kdevelop-pg-qt')
-makedepends=('cmake' 'automoc4')
-replaces=('kdevelop-php-docs')
-conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('11f9b3d2d27ad93aa666edae60d08f64ea82bb8d'
-          'f11194f5672d78406b6c54d53b10c02384e5bf99')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-
-  # kdevelop-php-docs
-  cd "${srcdir}"
-  mkdir build-docs
-  cd build-docs
-  cmake ../${pkgname}-docs-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-
-  # kdevelop-php-docs
-  cd "${srcdir}"/build-docs
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdevelop/PKGBUILD b/testing/kdevelop/PKGBUILD
deleted file mode 100644
index 22df44824..000000000
--- a/testing/kdevelop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 166547 2012-09-10 13:10:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=kdevelop
-pkgver=4.3.90
-pkgrel=1
-pkgdesc="A C/C++ development environment for KDE"
-arch=('i686' 'x86_64')
-url="http://www.kdevelop.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('18ed2dccdeef8abe41c135cd3038038790b4e50a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build 
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdevelop/kdevelop.install b/testing/kdevelop/kdevelop.install
deleted file mode 100644
index 5c1338e67..000000000
--- a/testing/kdevelop/kdevelop.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime  &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdevplatform/PKGBUILD b/testing/kdevplatform/PKGBUILD
deleted file mode 100644
index 5f8c52bff..000000000
--- a/testing/kdevplatform/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 166549 2012-09-10 13:31:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=kdevplatform
-pkgver=1.3.90
-_pkgver=4.3.90
-pkgrel=1
-pkgdesc="A C/C++ development platform for KDE"
-arch=('i686' 'x86_64')
-url="http://www.kdevelop.org/"
-license=('GPL')
-depends=('kdelibs' 'subversion' 'qjson')
-optdepends=("kdesdk-kompare: difference checking")
-makedepends=('cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('88300217681caa5c69f09b6428f2a6298cbd4733')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build 
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdevplatform/kdevplatform.install b/testing/kdevplatform/kdevplatform.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdevplatform/kdevplatform.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/kdewebdev/PKGBUILD b/testing/kdewebdev/PKGBUILD
deleted file mode 100644
index 7106b2276..000000000
--- a/testing/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 167662 2012-10-02 20:04:11Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdewebdev
-pkgname=('kdewebdev-kfilereplace'
-         'kdewebdev-kimagemapeditor'
-         'kdewebdev-klinkstatus'
-         'kdewebdev-kommander')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b811adaa5e996d9f588215be411a6a8d07f493ef')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdewebdev-kfilereplace() {
-	pkgdesc='Search & Replace Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfilereplace/"
-	install='kdewebdev.install'
-	cd $srcdir/build/kfilereplace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfilereplace
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kimagemapeditor() {
-	pkgdesc='HTML Image Map Editor'
-	depends=('kdebase-runtime')
-    url="http://www.kde.org/applications/development/kimagemapeditor/"
-	install='kdewebdev-kimagemapeditor.install'
-	cd $srcdir/build/kimagemapeditor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kimagemapeditor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-klinkstatus() {
-	pkgdesc='Link Checker'
-	depends=('kdebase-runtime' 'kdepimlibs' 'tidyhtml')
-    url="http://www.kde.org/applications/development/klinkstatus/"
-	install='kdewebdev.install'
-	cd $srcdir/build/klinkstatus
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klinkstatus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kommander() {
-	pkgdesc='Executor for Kommander dialogs'
-	depends=('kdebase-runtime')
-        url="http://www.kde.org/applications/development/kommander/"
-	cd $srcdir/build/kommander
-	make DESTDIR=$pkgdir install
-}
diff --git a/testing/kdewebdev/kdewebdev-kimagemapeditor.install b/testing/kdewebdev/kdewebdev-kimagemapeditor.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdewebdev/kdewebdev-kimagemapeditor.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kdewebdev/kdewebdev.install b/testing/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdewebdev/kdewebdev.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/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD
deleted file mode 100644
index c6ab79a54..000000000
--- a/testing/keyutils/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 162210 2012-06-23 16:28:17Z tpowa $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=keyutils
-pkgver=1.5.5
-pkgrel=3
-pkgdesc="Linux Key Management Utilities"
-arch=(i686 x86_64)
-url="http://www.kernel.org"
-license=('GPL2' 'LGPL2.1')
-depends=('glibc' 'sh')
-backup=(etc/request-key.conf)
-source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d759680b2f23c99af95938f5026f25fb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib"  install
-  # add nfsidmap to config file #30396
-  echo "# NFS idmap resolver" >> $pkgdir/etc/request-key.conf
-  echo "create id_resolver * * /usr/sbin/nfsidmap %k %d" \
-       >> $pkgdir/etc/request-key.conf
-}
diff --git a/testing/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch b/testing/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
deleted file mode 100644
index 8c4ecf83c..000000000
--- a/testing/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 88c247f7f18ac25181ddcaff97fbbecbd3a29f57 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.de.marchi@gmail.com>
-Date: Wed, 3 Oct 2012 16:28:24 -0300
-Subject: [PATCH] depmod: fix parsing of modules.order with compressed modules
-
-We now index the modules by uncompressed-relative-path instead of
-relative-path. This is because the file modules.order, coming from
-kernel, always comes with uncompressed paths. This fixes the issue of
-not sorting the aliases correctly due to paths not matching when using
-compressed modules.
----
- tools/depmod.c | 46 +++++++++++++++++++++++++++++-----------------
- 1 file changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/tools/depmod.c b/tools/depmod.c
-index 0bf2dea..ff19d6e 100644
---- a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -39,6 +39,8 @@
- #define DEFAULT_VERBOSE LOG_WARNING
- static int verbose = DEFAULT_VERBOSE;
- 
-+#define KMOD_EXT_UNC 0
-+
- static const struct kmod_ext {
- 	const char *ext;
- 	size_t len;
-@@ -1001,6 +1003,7 @@ struct mod {
- 	uint16_t idx; /* index in depmod->modules.array */
- 	uint16_t users; /* how many modules depend on this one */
- 	uint8_t dep_loop : 1;
-+	char *uncrelpath; /* same as relpath but ending in .ko */
- 	char modname[];
- };
- 
-@@ -1014,7 +1017,7 @@ struct depmod {
- 	const struct cfg *cfg;
- 	struct kmod_ctx *ctx;
- 	struct array modules;
--	struct hash *modules_by_relpath;
-+	struct hash *modules_by_uncrelpath;
- 	struct hash *modules_by_name;
- 	struct hash *symbols;
- 	unsigned int dep_loops;
-@@ -1025,6 +1028,7 @@ static void mod_free(struct mod *mod)
- 	DBG("free %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path);
- 	array_free_array(&mod->deps);
- 	kmod_module_unref(mod->kmod);
-+	free(mod->uncrelpath);
- 	free(mod);
- }
- 
-@@ -1066,10 +1070,10 @@ static int depmod_init(struct depmod *depmod, struct cfg *cfg,
- 
- 	array_init(&depmod->modules, 128);
- 
--	depmod->modules_by_relpath = hash_new(512, NULL);
--	if (depmod->modules_by_relpath == NULL) {
-+	depmod->modules_by_uncrelpath = hash_new(512, NULL);
-+	if (depmod->modules_by_uncrelpath == NULL) {
- 		err = -errno;
--		goto modules_by_relpath_failed;
-+		goto modules_by_uncrelpath_failed;
- 	}
- 
- 	depmod->modules_by_name = hash_new(512, NULL);
-@@ -1089,8 +1093,8 @@ static int depmod_init(struct depmod *depmod, struct cfg *cfg,
- symbols_failed:
- 	hash_free(depmod->modules_by_name);
- modules_by_name_failed:
--	hash_free(depmod->modules_by_relpath);
--modules_by_relpath_failed:
-+	hash_free(depmod->modules_by_uncrelpath);
-+modules_by_uncrelpath_failed:
- 	return err;
- }
- 
-@@ -1100,7 +1104,7 @@ static void depmod_shutdown(struct depmod *depmod)
- 
- 	hash_free(depmod->symbols);
- 
--	hash_free(depmod->modules_by_relpath);
-+	hash_free(depmod->modules_by_uncrelpath);
- 
- 	hash_free(depmod->modules_by_name);
- 
-@@ -1114,7 +1118,7 @@ static void depmod_shutdown(struct depmod *depmod)
- static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
- {
- 	const struct cfg *cfg = depmod->cfg;
--	const char *modname;
-+	const char *modname, *lastslash;
- 	size_t modnamelen;
- 	struct mod *mod;
- 	int err;
-@@ -1134,7 +1138,8 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
- 	array_init(&mod->deps, 4);
- 
- 	mod->path = kmod_module_get_path(kmod);
--	mod->baselen = strrchr(mod->path, '/') - mod->path;
-+	lastslash = strrchr(mod->path, '/');
-+	mod->baselen = lastslash - mod->path;
- 	if (strncmp(mod->path, cfg->dirname, cfg->dirnamelen) == 0 &&
- 			mod->path[cfg->dirnamelen] == '/')
- 		mod->relpath = mod->path + cfg->dirnamelen + 1;
-@@ -1144,25 +1149,32 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
- 	err = hash_add_unique(depmod->modules_by_name, mod->modname, mod);
- 	if (err < 0) {
- 		ERR("hash_add_unique %s: %s\n", mod->modname, strerror(-err));
--		free(mod);
--		return err;
-+		goto fail;
- 	}
- 
- 	if (mod->relpath != NULL) {
--		err = hash_add_unique(depmod->modules_by_relpath,
--				      mod->relpath, mod);
-+		size_t uncrelpathlen = lastslash - mod->relpath + modnamelen
-+				       + kmod_exts[KMOD_EXT_UNC].len;
-+		mod->uncrelpath = memdup(mod->relpath, uncrelpathlen + 1);
-+		mod->uncrelpath[uncrelpathlen] = '\0';
-+		err = hash_add_unique(depmod->modules_by_uncrelpath,
-+				      mod->uncrelpath, mod);
- 		if (err < 0) {
- 			ERR("hash_add_unique %s: %s\n",
- 			    mod->relpath, strerror(-err));
- 			hash_del(depmod->modules_by_name, mod->modname);
--			free(mod);
--			return err;
-+			goto fail;
- 		}
- 	}
- 
- 	DBG("add %p kmod=%p, path=%s\n", mod, kmod, mod->path);
- 
- 	return 0;
-+
-+fail:
-+	free(mod->uncrelpath);
-+	free(mod);
-+	return err;
- }
- 
- static int depmod_module_del(struct depmod *depmod, struct mod *mod)
-@@ -1170,7 +1182,7 @@ static int depmod_module_del(struct depmod *depmod, struct mod *mod)
- 	DBG("del %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path);
- 
- 	if (mod->relpath != NULL)
--		hash_del(depmod->modules_by_relpath, mod->relpath);
-+		hash_del(depmod->modules_by_uncrelpath, mod->relpath);
- 
- 	hash_del(depmod->modules_by_name, mod->modname);
- 
-@@ -1472,7 +1484,7 @@ static void depmod_modules_sort(struct depmod *depmod)
- 			continue;
- 		line[len - 1] = '\0';
- 
--		mod = hash_find(depmod->modules_by_relpath, line);
-+		mod = hash_find(depmod->modules_by_uncrelpath, line);
- 		if (mod == NULL)
- 			continue;
- 		mod->sort_idx = idx - total;
--- 
-1.7.12.4
-
diff --git a/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch b/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch
deleted file mode 100644
index 4ef3d2775..000000000
--- a/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 66f3228d17d66d7e2dd484427259290fbc82b2f0 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Mon, 8 Oct 2012 19:04:16 -0300
-Subject: [PATCH] libkmod: Add support for '.' in module parameter on kcmdline
-
-Otherwise we fail to parse arguments in kernel command line like
-testmodule.testparam=1.5G
-
-Suggested-by: Selim T. Erdogan <selim@alumni.cs.utexas.edu>
----
- libkmod/libkmod-config.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
-index 70044f0..398468e 100644
---- a/libkmod/libkmod-config.c
-+++ b/libkmod/libkmod-config.c
-@@ -567,8 +567,10 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
- 			modname = p + 1;
- 			break;
- 		case '.':
--			*p = '\0';
--			param = p + 1;
-+			if (param == NULL) {
-+				*p = '\0';
-+				param = p + 1;
-+			}
- 			break;
- 		case '=':
- 			if (param != NULL)
--- 
-1.7.12.4
-
diff --git a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
deleted file mode 100644
index 8916689f7..000000000
--- a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sat, 31 Mar 2012 12:17:39 +0200
-Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules
-
-This means that we can move the configuration paths from /lib
-to /usr/lib without having to touch the kernel and related
-packages.
-
-That can be dealt with separately at a later location, in which case
-all we have to do is revert this patch.
-
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- libkmod/libkmod.c     |    2 +-
- tools/depmod.c        |    2 +-
- tools/modinfo.c       |    4 ++--
- tools/modprobe.c      |    4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index 12c1112..11edfa0 100644
---- a/libkmod/libkmod.c
-+++ b/libkmod/libkmod.c
-@@ -196,7 +196,7 @@ static int log_priority(const char *priority)
- 	return 0;
- }
- 
--static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules";
-+static const char *dirname_default_prefix = "/lib/modules";
- 
- static char *get_kernel_release(const char *dirname)
- {
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index 7bb1c5d..454d538 100644
---- a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[])
- 	}
- 
- 	cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
--				  "%s" ROOTPREFIX "/lib/modules/%s",
-+				  "%s/lib/modules/%s",
- 				  root == NULL ? "" : root, cfg.kversion);
- 
- 	if (optind == argc)
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index aa5223f..b13cd4b 100644
---- a/tools/modinfo.c
-+++ b/tools/modinfo.c
-@@ -339,7 +339,7 @@ static void help(const char *progname)
- 		"\t-0, --null                  Use \\0 instead of \\n\n"
- 		"\t-F, --field=FIELD           Print only provided FIELD\n"
- 		"\t-k, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
--		"\t-b, --basedir=DIR           Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+		"\t-b, --basedir=DIR           Use DIR as filesystem root for /lib/modules\n"
- 		"\t-V, --version               Show version\n"
- 		"\t-h, --help                  Show this help\n",
- 		progname);
-@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[])
- 			}
- 			kversion = u.release;
- 		}
--		snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s",
-+		snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s",
- 			 root, kversion);
- 		dirname = dirname_buf;
- 	}
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 4760682..ccb41d8 100644
---- a/tools/modprobe.c
-+++ b/tools/modprobe.c
-@@ -128,7 +128,7 @@ static void help(const char *progname)
- 		"\t-n, --show                  Same as --dry-run\n"
- 
- 		"\t-C, --config=FILE           Use FILE instead of default search paths\n"
--		"\t-d, --dirname=DIR           Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+		"\t-d, --dirname=DIR           Use DIR as filesystem root for /lib/modules\n"
- 		"\t-S, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
- 
- 		"\t-s, --syslog                print to syslog, not stderr\n"
-@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv)
- 			kversion = u.release;
- 		}
- 		snprintf(dirname_buf, sizeof(dirname_buf),
--				"%s" ROOTPREFIX "/lib/modules/%s", root,
-+				"%s/lib/modules/%s", root,
- 				kversion);
- 		dirname = dirname_buf;
- 	}
--- 
-1.7.9.5
-
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
deleted file mode 100644
index 457b9ad19..000000000
--- a/testing/kmod/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 169420 2012-10-20 19:15:57Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=kmod
-pkgver=10
-pkgrel=2
-pkgdesc="Linux kernel module handling"
-arch=('i686' 'x86_64')
-url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
-license=('GPL2')
-depends=('glibc' 'zlib')
-makedepends=('gtk-doc')
-options=('!libtool')
-provides=('module-init-tools=3.16')
-conflicts=('module-init-tools')
-replaces=('module-init-tools')
-source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
-        '0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch'
-        '0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch'
-        "depmod-search.conf")
-md5sums=('e2a883c4df15a50f78a7a61d5b64089f'
-         '47005a6e70496d429d40e3fc4fd89755'
-         'ecf5bfd4fd9ed14cf0dc1ce4025d256b'
-         'dd62cbf62bd8f212f51ef8c43bec9a77')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # upstream commit 88c247f7f18ac25181ddcaff97fbbecbd3a29f57
-  patch -Np1 < "$srcdir/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch"
-
-  # upstream commit 66f3228d17d66d7e2dd484427259290fbc82b2f0
-  patch -Np1 < "$srcdir/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch"
-
-  ./configure \
-    --sysconfdir=/etc \
-    --enable-gtk-doc \
-    --with-zlib
-
-  make
-}
-
-check() {
-  # testsuite is broken on 32-bit because of an unhandled EEXIST on mkdir_p
-  make -C "$pkgname-$pkgver" check || :
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  # extra directories
-  install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin"
-
-  # add symlinks to kmod
-  ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
-  ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod"
-
-  for tool in {ins,ls,rm}mod modinfo; do
-    ln -s kmod "$pkgdir/usr/bin/$tool"
-  done
-
-  # install depmod.d file for search/ dir
-  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf
deleted file mode 100644
index 36f2cf7db..000000000
--- a/testing/kmod/depmod-search.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /usr/lib/depmod.d/search.conf
-#
-
-search updates extramodules built-in
diff --git a/testing/kmod/kmod.install b/testing/kmod/kmod.install
deleted file mode 100644
index 0a2e88dc5..000000000
--- a/testing/kmod/kmod.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-  if [ "$(vercmp 9-2 "$2")" -eq 1 ]; then
-    echo "==> Kernel modules are now only read from /usr/lib/modules, all custom"
-    echo "    built kernels and modules must be moved there before rebooting."
-  fi
-}
-
diff --git a/testing/konversation/PKGBUILD b/testing/konversation/PKGBUILD
deleted file mode 100644
index 6bd3741cd..000000000
--- a/testing/konversation/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 168841 2012-10-16 11:53:50Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: James Rayner <iphitus@gmail.com>
-# Contributor: Sergio Jovani Guzman <moret@paretux.org>
-
-pkgname=konversation
-pkgver=1.4
-pkgrel=3
-pkgdesc="A user friendly IRC client for KDE"
-arch=('i686' 'x86_64')
-url="http://konversation.kde.org"
-depends=('kdebase-runtime' 'kdepimlibs')
-makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
-optdepends=('python: python scripting support')
-license=('GPL2' 'FDL')
-install=${pkgname}.install
-options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-  
-  # Remove a bunch of symlinks pointing to non-existant files
-  for _lang in pt_BR uk sv et de en nl; do
-     rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
-  done
-}
diff --git a/testing/konversation/konversation.install b/testing/konversation/konversation.install
deleted file mode 100644
index 8834e059a..000000000
--- a/testing/konversation/konversation.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   update-desktop-database -q
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   post_install
-}
diff --git a/testing/kradio/PKGBUILD b/testing/kradio/PKGBUILD
deleted file mode 100644
index e06525a04..000000000
--- a/testing/kradio/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 163060 2012-07-06 15:21:36Z ibiru $
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.4
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL2')
-pkgdesc="A comfortable KDE internet and AM/FM radio application"
-url="http://kradio.sourceforge.net/"
-depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
-makedepends=('automoc4' 'cmake')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc})
-md5sums=('4b5495a4f1dda21f7201bc8db0d4f95e'
-         '51c6d4ec0047d2df595b458bde285012')
-
-build() {
-  cd "$srcdir"
-  mkdir build
-  cd build
-  cmake ../${pkgname}4-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/kradio/kradio.install b/testing/kradio/kradio.install
deleted file mode 100644
index 460e85d7f..000000000
--- a/testing/kradio/kradio.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/krb5/MITKRB5-SA-2012-001.patch b/testing/krb5/MITKRB5-SA-2012-001.patch
deleted file mode 100644
index 938b56570..000000000
--- a/testing/krb5/MITKRB5-SA-2012-001.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
-index 23623fe..8ada9d0 100644
---- a/src/kdc/do_as_req.c
-+++ b/src/kdc/do_as_req.c
-@@ -463,7 +463,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
-     krb5_enctype useenctype;
-     struct as_req_state *state;
- 
--    state = malloc(sizeof(*state));
-+    state = calloc(sizeof(*state), 1);
-     if (!state) {
-         (*respond)(arg, ENOMEM, NULL);
-         return;
-@@ -486,6 +486,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
-     state->authtime = 0;
-     state->c_flags = 0;
-     state->req_pkt = req_pkt;
-+    state->inner_body = NULL;
-     state->rstate = NULL;
-     state->sname = 0;
-     state->cname = 0;
-diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c
-index 9d8cb34..d4ece3f 100644
---- a/src/kdc/kdc_preauth.c
-+++ b/src/kdc/kdc_preauth.c
-@@ -1438,7 +1438,8 @@ etype_info_helper(krb5_context context, krb5_kdc_req *request,
-                 continue;
- 
-             }
--            if (request_contains_enctype(context, request, db_etype)) {
-+            if (krb5_is_permitted_enctype(context, db_etype) &&
-+                request_contains_enctype(context, request, db_etype)) {
-                 retval = _make_etype_info_entry(context, client->princ,
-                                                 client_key, db_etype,
-                                                 &entry[i], etype_info2);
-diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index a43b291..94dad3a 100644
---- a/src/kdc/kdc_util.c
-+++ b/src/kdc/kdc_util.c
-@@ -2461,6 +2461,7 @@ kdc_handle_protected_negotiation(krb5_data *req_pkt, krb5_kdc_req *request,
-         return 0;
-     pa.magic = KV5M_PA_DATA;
-     pa.pa_type = KRB5_ENCPADATA_REQ_ENC_PA_REP;
-+    memset(&checksum, 0, sizeof(checksum));
-     retval = krb5_c_make_checksum(kdc_context,0, reply_key,
-                                   KRB5_KEYUSAGE_AS_REQ, req_pkt, &checksum);
-     if (retval != 0)
-diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
-index c4bf92e..367c894 100644
---- a/src/lib/kdb/kdb_default.c
-+++ b/src/lib/kdb/kdb_default.c
-@@ -61,6 +61,9 @@ krb5_dbe_def_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap)
-     krb5_boolean        saw_non_permitted = FALSE;
- 
-     ret = 0;
-+    if (ktype != -1 && !krb5_is_permitted_enctype(kcontext, ktype))
-+        return KRB5_KDB_NO_PERMITTED_KEY;
-+
-     if (kvno == -1 && stype == -1 && ktype == -1)
-         kvno = 0;
- 
diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD
deleted file mode 100644
index f38a4f8c0..000000000
--- a/testing/krb5/PKGBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# $Id: PKGBUILD 165034 2012-08-09 09:25:36Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=krb5
-pkgver=1.10.3
-pkgrel=1
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url="http://web.mit.edu/kerberos/"
-license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar
-        krb5-1.10.1-gcc47.patch
-        krb5-kadmind
-        krb5-kadmind.service
-        krb5-kdc
-        krb5-kdc.service
-        krb5-kpropd
-        krb5-kpropd.service
-        krb5-kpropd@.service
-        krb5-kpropd.socket)
-sha1sums=('04ab9837e5d1958158bcb30bd6480201089a0cbb'
-          '78b759d566b1fdefd9bbcd06df14f07f12effe96'
-          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
-          'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
-          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e'
-          '7f402078fa65bb9ff1beb6cbbbb017450df78560'
-          '614401dd4ac18e310153240bb26eb32ff1e8cf5b'
-          '023a8164f8ee7066ac814486a68bc605e79f6101'
-          'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${pkgname}-${pkgver}.tar.gz
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-
-   # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized
-   # in this function [-Werror=maybe-uninitialized]
-   # As this is generated code, just ignore the complaint.
-   patch -Np2 -i ../../krb5-1.10.1-gcc47.patch
-   rm lib/krb5/krb/deltat.c
-
-   # 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 \
-               --without-system-verto
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install
-
-   # Fix FS#29889
-   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples
-
-   # 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,kadmind,kpropd} "${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
-
-   # systemd stuff
-   install -dm 755 "${pkgdir}"/usr/lib/systemd/system
-   install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \
-      "${pkgdir}"/usr/lib/systemd/system
-}
diff --git a/testing/krb5/krb5-1.10.1-gcc47.patch b/testing/krb5/krb5-1.10.1-gcc47.patch
deleted file mode 100644
index ffd01c2a3..000000000
--- a/testing/krb5/krb5-1.10.1-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
---- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y	2011-09-06 07:34:32.000000000 -0400
-+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y	2012-03-24 13:15:11.543551318 -0400
-@@ -44,6 +44,7 @@
- #ifdef __GNUC__
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wuninitialized"
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- #endif
- 
- #include <ctype.h>
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-kadmind.service b/testing/krb5/krb5-kadmind.service
deleted file mode 100644
index f3836c898..000000000
--- a/testing/krb5/krb5-kadmind.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 administration server
-
-[Service]
-ExecStart=/usr/sbin/kadmind -nofork
-
-[Install]
-WantedBy=multi-user.target
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/krb5/krb5-kdc.service b/testing/krb5/krb5-kdc.service
deleted file mode 100644
index 6ec93bb72..000000000
--- a/testing/krb5/krb5-kdc.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 KDC
-
-[Service]
-ExecStart=/usr/sbin/krb5kdc -n
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/krb5/krb5-kpropd b/testing/krb5/krb5-kpropd
deleted file mode 100644
index a0077d68e..000000000
--- a/testing/krb5/krb5-kpropd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kpropd`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Database Propagation Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kpropd -S
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon kpropd
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Database Propagation Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon kpropd
-            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-kpropd.service b/testing/krb5/krb5-kpropd.service
deleted file mode 100644
index a7c5b579d..000000000
--- a/testing/krb5/krb5-kpropd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Service]
-ExecStart=/usr/sbin/kpropd -S
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/krb5/krb5-kpropd.socket b/testing/krb5/krb5-kpropd.socket
deleted file mode 100644
index 4389290c0..000000000
--- a/testing/krb5/krb5-kpropd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Socket]
-ListenStream=754
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/testing/krb5/krb5-kpropd@.service b/testing/krb5/krb5-kpropd@.service
deleted file mode 100644
index 46f7e3639..000000000
--- a/testing/krb5/krb5-kpropd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-Conflicts=krb5-kpropd.service
-
-[Service]
-ExecStart=/usr/sbin/kpropd
-StandardInput=socket
-StandardError=syslog
diff --git a/testing/ldns/PKGBUILD b/testing/ldns/PKGBUILD
deleted file mode 100644
index 4613191f4..000000000
--- a/testing/ldns/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 169587 2012-10-23 22:55:24Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: mathieui <mathieui@mathieui.net>
-# Contributor: jiribb <jiribb@gmail.com>
-
-pkgname=ldns
-pkgver=1.6.14
-pkgrel=1
-pkgdesc='Fast DNS library supporting recent RFCs'
-url='http://www.nlnetlabs.nl/projects/ldns/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-options=('!libtool')
-depends=('openssl' 'dnssec-anchors')
-optdepends=('libpcap: ldns-dpa tool')
-makedepends=('libpcap')
-source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2ef5fbf33b25d2f7b736c332ebccc0862dd12d02')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--disable-rpath \
-		--with-drill \
-		--with-examples \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD
deleted file mode 100644
index b5c8f869d..000000000
--- a/testing/less/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 166186 2012-09-05 10:54:45Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=less
-pkgver=451
-pkgrel=1
-pkgdesc="A terminal based program for viewing text files"
-license=('GPL3')
-arch=('i686' 'x86_64')
-url="http://www.greenwoodsoftware.com/less"
-groups=('base')
-depends=('ncurses' 'pcre')
-source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('765f082658002b2b46b86af4a0da1842'
-         'a5493f4598ba7c9f81782683f3c27119')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}"/usr install
-}
diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD
deleted file mode 100644
index 44fdad7ff..000000000
--- a/testing/libarchive/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 166896 2012-09-21 02:03:06Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=libarchive
-pkgver=3.0.4
-pkgrel=2
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/"
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz"
-        libarchive-3.0.x-fix-mtree-writer.patch)
-md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16'
-         '6d36a50a7282db6576bd1fbc23f08055')
-sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac'
-            'f0081c0d7d7875fc91c683b14fe4876d56b6585f45be9181c755eba4b522f5b9')
-
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i $srcdir/libarchive-3.0.x-fix-mtree-writer.patch
-  ./configure --prefix=/usr --without-xml2
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
diff --git a/testing/libarchive/libarchive-3.0.x-fix-mtree-writer.patch b/testing/libarchive/libarchive-3.0.x-fix-mtree-writer.patch
deleted file mode 100644
index dbc89686a..000000000
--- a/testing/libarchive/libarchive-3.0.x-fix-mtree-writer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/libarchive/archive_write_set_format_mtree.c
-+++ b/libarchive/archive_write_set_format_mtree.c
-@@ -887,6 +887,19 @@ write_entry(struct archive_write *a, struct mtree_entry *me)
- 
- 	archive_string_empty(&mtree->ebuf);
- 	str = (mtree->indent)? &mtree->ebuf : &mtree->buf;
-+
-+	/* If the pathname does not have a path separator, we have to
-+	 * add "./" to the head of the pathename because mtree reader
-+	 * will suppose that it is v1(a.k.a classic) mtree format and
-+	 * change the directory unexpectedly and so it will make a wrong
-+	 * path. */
-+	if (strchr(me->pathname, '/') == NULL &&
-+	    strcmp(me->pathname, ".") != 0) {
-+		archive_strcat(str, "./");
-+	}
-+	/* mtree reader does not accept an absolute path. */
-+	else if (me->pathname[0] == '/')
-+		archive_strappend_char(str, '.');
- 	mtree_quote(str, me->pathname);
- 	keys = get_keys(mtree, me);
- 	if ((keys & F_NLINK) != 0 &&
---- a/libarchive/test/test_read_format_mtree.c
-+++ b/libarchive/test/test_read_format_mtree.c
-@@ -37,7 +37,8 @@ test_read_format_mtree1(void)
- 	 * without relying on overflow.  This assumes that long long
- 	 * is at least 64 bits. */
- 	static const long long max_int64 = ((((long long)1) << 62) - 1) + (((long long)1) << 62);
--	time_t min_time, t;
-+	time_t min_time;
-+	volatile time_t t;
- 
- 	extract_reference_file(reffile);
- 
\ No newline at end of file
diff --git a/testing/libcap-ng/PKGBUILD b/testing/libcap-ng/PKGBUILD
deleted file mode 100644
index e67e9ee4a..000000000
--- a/testing/libcap-ng/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 165202 2012-08-12 20:44:32Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=libcap-ng
-pkgver=0.7
-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=('85c14a2442a3721383a1e2284e254846')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --enable-static=no --with-python=no
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libcroco/PKGBUILD b/testing/libcroco/PKGBUILD
deleted file mode 100644
index 87e17f8b5..000000000
--- a/testing/libcroco/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169176 2012-10-18 19:23:47Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libcroco
-pkgver=0.6.7
-pkgrel=1
-pkgdesc="A CSS parsing library"
-arch=('x86_64' 'i686')
-depends=('glib2' 'libxml2')
-makedepends=('intltool')
-license=('LGPL')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz)
-url="http://www.gnome.org"
-sha256sums=('892b8a7e311b80d0a5a633b8204fed5656d7af20e884719e5ec6e340e1f0cd88')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libdrm-old/COPYING b/testing/libdrm-old/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/testing/libdrm-old/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- Copyright 2005 Adam Jackson.
-
- 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, 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 ADAM JACKSON 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 Precision Insight, Inc., Cedar Park, Texas.
- Copyright 2000 VA Linux Systems, Inc., Sunnyvale, 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 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.
diff --git a/testing/libdrm-old/PKGBUILD b/testing/libdrm-old/PKGBUILD
deleted file mode 100644
index f72b03e5c..000000000
--- a/testing/libdrm-old/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-#Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libdrm-old
-pkgname=(libdrm-old libdrm-nouveau1)
-pkgver=2.4.33
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-options=('!libtool' '!emptydirs')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-)
-sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
-          '825ff5e0c4238b31bdea52f104bfec8949270e25'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-build() {
-  cd "libdrm-$pkgver"
-  patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --disable-libkms \
-      --disable-intel \
-      --disable-radeon \
-      --enable-nouveau-experimental-api
-  make
-}
-
-package_libdrm-old() {
-  pkgdesc="Userspace interface to kernel DRM services - used as makedepends for nouveau-dri"
-  conflicts=('libdrm')
-  provides=("libdrm=$pkgver")
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/libdrm_nouveau.so.1*
-}
-
-package_libdrm-nouveau1() {
-  pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for nouveau-dri"
-  depends=(libdrm)
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
-  make -C nouveau DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
-  rm -rf "$pkgdir"/usr/include/  "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc  "$pkgdir"/usr/lib/libdrm_nouveau.so
-}
diff --git a/testing/libdrm-old/no-pthread-stubs.patch b/testing/libdrm-old/no-pthread-stubs.patch
deleted file mode 100644
index 5430244f9..000000000
--- a/testing/libdrm-old/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/testing/libdrm/COPYING b/testing/libdrm/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/testing/libdrm/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- Copyright 2005 Adam Jackson.
-
- 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, 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 ADAM JACKSON 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 Precision Insight, Inc., Cedar Park, Texas.
- Copyright 2000 VA Linux Systems, Inc., Sunnyvale, 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 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.
diff --git a/testing/libdrm/PKGBUILD b/testing/libdrm/PKGBUILD
deleted file mode 100644
index b2aa623e4..000000000
--- a/testing/libdrm/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 165602 2012-08-27 08:01:37Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libdrm
-pkgver=2.4.39
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-replaces=('libdrm-new' 'libdrm-nouveau')
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING)
-sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d'
-            '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930'
-            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../no-pthread-stubs.patch
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-vmwgfx-experimental-api
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make -k check
-}
-
-package() {
-  cd $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/libdrm/git_fixes.diff b/testing/libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/testing/libdrm/git_fixes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 19441f3..eb9dd32 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
- 				      bufmgr_gem->vma_cache.next,
- 				      vma_list);
- 		assert(bo_gem->map_count == 0);
--		DRMLISTDEL(&bo_gem->vma_list);
-+		DRMLISTDELINIT(&bo_gem->vma_list);
- 
- 		if (bo_gem->mem_virtual) {
- 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index a8de91d9d..000000000
--- a/testing/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD
deleted file mode 100644
index c7a5b6ac9..000000000
--- a/testing/libedit/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 165760 2012-08-29 13:07:56Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Roman Cheplyaka <roma@ro-che.info>
-
-pkgname=libedit
-pkgver=20120601_3.0
-pkgrel=1
-pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
-url='http://www.thrysoee.dk/editline/'
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('ncurses')
-options=('!libtool')
-source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
-sha1sums=('18ec27120f6abb222754e9f283d000fec0dcfc08')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
-	./configure --prefix=/usr --enable-widec --enable-static=no
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
-	make prefix="${pkgdir}"/usr install
-
-	cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3
-	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
-}
diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD
deleted file mode 100644
index dff51f733..000000000
--- a/testing/libevent/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165586 2012-08-26 13:51:21Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=libevent
-pkgver=2.0.20
-pkgrel=1
-pkgdesc="An event notification library"
-arch=('i686' 'x86_64')
-url="http://www.monkey.org/~provos/libevent/"
-license=('BSD')
-depends=('openssl')
-optdepends=('python2: to use event_rpcgen.py')
-options=('!libtool')
-source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc})
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  sed -i 's#python#python2#' event_rpcgen.py
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  make check || true # this never worked, should be taken upstream
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('94270cdee32c0cd0aa9f4ee6ede27e8e'
-         '5310233871ef2f2b3536114bf0377a42')
diff --git a/testing/libffado/PKGBUILD b/testing/libffado/PKGBUILD
deleted file mode 100644
index 7b0928606..000000000
--- a/testing/libffado/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 167215 2012-09-28 14:21:22Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: galiyosha@gmail.com
-# Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
-
-pkgname=libffado
-pkgver=2.1.0
-pkgrel=3
-pkgdesc="Driver for FireWire audio devices"
-arch=('i686' 'x86_64')
-url="http://www.ffado.org/"
-license=('GPL')
-depends=('libiec61883' 'libavc1394' 'dbus-c++'
-         'libxml++' 'alsa-lib' 'libsigc++' 'libconfig')
-makedepends=('scons' 'subversion' 'python2-pyqt')
-optdepends=('python2: ffado-diag'
-            'python2-pyqt: mixer applet')
-provides=('ffado')
-source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz"
-        'python2-qt.patch')
-md5sums=('26bce2be0b9c1fa4e614f2f494edf388'
-         '10aa837f5521da213caa93e1ddc58c0e')
-
-_scons-conf() {
-  scons DEBUG=False \
-        PREFIX=/usr \
-        MANDIR=/usr/share/man \
-        UDEVDIR=/usr/lib/udev/rules.d \
-        COMPILE_FLAGS="$CFLAGS" $@
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  patch -Np1 -i "$srcdir/python2-qt.patch"
-
-  # build!
-  if [ "$CARCH" = 'x86_64' ]; then
-    _scons-conf ENABLE_OPTIMIZATIONS=True
-  else
-    _scons-conf
-  fi
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install
-
-  # desktop files & icons
-  install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \
-    "$pkgdir/usr/share/applications/ffadomixer.desktop"
-
-  install -Dm644 support/xdg/hi64-apps-ffado.png \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libffado/python2-qt.patch b/testing/libffado/python2-qt.patch
deleted file mode 100644
index 042aa2665..000000000
--- a/testing/libffado/python2-qt.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff -baur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct
---- libffado-2.1.0.orig/SConstruct	2012-09-19 14:18:53.827448582 +0800
-+++ libffado-2.1.0/SConstruct	2012-09-19 14:20:01.670414379 +0800
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2007, 2008, 2010 Arnold Krille
-@@ -134,7 +134,7 @@
- 
- def CheckForPyModule( context, module ):
-     context.Message( "Checking for the python module '" + module + "' " )
--    ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" )
-+    ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" )
-     context.Result( ret[0] )
-     return ret[0]
- 
-@@ -351,7 +351,7 @@
- 
- # PyQT checks
- build_mixer = False
--if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
-+if conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
-     env['PYUIC4'] = True
-     build_mixer = True
- 
-diff -baur libffado-2.1.0.orig/admin/dbus.py libffado-2.1.0/admin/dbus.py
---- libffado-2.1.0.orig/admin/dbus.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/dbus.py	2012-09-19 14:19:02.957399122 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-diff -baur libffado-2.1.0.orig/admin/doxygen.py libffado-2.1.0/admin/doxygen.py
---- libffado-2.1.0.orig/admin/doxygen.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/doxygen.py	2012-09-19 14:19:02.957399122 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.1.0.orig/admin/pkgconfig.py libffado-2.1.0/admin/pkgconfig.py
---- libffado-2.1.0.orig/admin/pkgconfig.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/pkgconfig.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.1.0.orig/admin/pyuic.py libffado-2.1.0/admin/pyuic.py
---- libffado-2.1.0.orig/admin/pyuic.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/pyuic.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.1.0.orig/admin/pyuic4.py libffado-2.1.0/admin/pyuic4.py
---- libffado-2.1.0.orig/admin/pyuic4.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/pyuic4.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-@@ -21,10 +21,8 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
--import imp
--
- def pyuic4_action( target, source, env ):
--	env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
-+	env.Execute( "python2-pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
- 	return 0
- 
- def pyuic4_string( target, source, env ):
-@@ -34,7 +32,7 @@
- 	context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " )
- 	ret = True
- 	try:
--		imp.find_module( "pyqtconfig" )
-+		import PyQt4.pyqtconfig
- 	except ImportError:
- 		ret = False
- 	context.Result( ret )
-diff -baur libffado-2.1.0.orig/admin/scanreplace.py libffado-2.1.0/admin/scanreplace.py
---- libffado-2.1.0.orig/admin/scanreplace.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/scanreplace.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.1.0.orig/doc/SConscript libffado-2.1.0/doc/SConscript
---- libffado-2.1.0.orig/doc/SConscript	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/doc/SConscript	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2
- 
- Import( 'env' )
- 
-diff -baur libffado-2.1.0.orig/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript
---- libffado-2.1.0.orig/support/dbus/SConscript	2012-09-19 14:18:53.827448582 +0800
-+++ libffado-2.1.0/support/dbus/SConscript	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/bin/env python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007,2008,2011 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-diff -baur libffado-2.1.0.orig/support/mixer-qt4/SConscript libffado-2.1.0/support/mixer-qt4/SConscript
---- libffado-2.1.0.orig/support/mixer-qt4/SConscript	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/mixer-qt4/SConscript	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2009 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py
---- libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2008 by Pieter Palmers
- #               2007-2009 by Arnold Krille
-diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in
---- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2009 by Pieter Palmers
- #               2007-2009 by Arnold Krille
-diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in libffado-2.1.0/support/mixer-qt4/ffado-mixer.in
---- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in	2012-09-19 14:18:53.834115214 +0800
-+++ libffado-2.1.0/support/mixer-qt4/ffado-mixer.in	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2008 by Pieter Palmers
- #               2007-2009 by Arnold Krille
-diff -baur libffado-2.1.0.orig/support/tools/SConscript libffado-2.1.0/support/tools/SConscript
---- libffado-2.1.0.orig/support/tools/SConscript	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/SConscript	2012-09-19 14:20:51.970141882 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-@@ -43,7 +43,7 @@
- # For the installation of the stuff
- e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e )
- 
--e.Command( "static_info.txt", "#/SConstruct", "python support/tools/ffado-diag-static > $TARGET" )
-+e.Command( "static_info.txt", "#/SConstruct", "python2 support/tools/ffado-diag-static > $TARGET" )
- 
- e.ScanReplace( "ffado-diag.in" )
- 
-diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/support/tools/ffado-diag-static
---- libffado-2.1.0.orig/support/tools/ffado-diag-static	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/ffado-diag-static	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- 
- #
-@@ -74,7 +74,7 @@
-     # check libraries
-     print "   gcc ............... %s" % get_version_first_line('gcc --version')
-     print "   g++ ............... %s" % get_version_first_line('g++ --version')
--    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
-+    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
-     print "   jackd ............. %s" % get_version_first_line('jackd --version')
-     print "     path ............ %s" % get_command_path('jackd')
-     print "     flags ........... %s" % get_package_flags("jack")
-diff -baur libffado-2.1.0.orig/support/tools/ffado-diag.in libffado-2.1.0/support/tools/ffado-diag.in
---- libffado-2.1.0.orig/support/tools/ffado-diag.in	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/ffado-diag.in	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- 
- #
-@@ -120,7 +120,7 @@
-     print " Prerequisites (dynamic at run-time)..."
-     print "   gcc ............... %s" % get_version_first_line('gcc --version')
-     print "   g++ ............... %s" % get_version_first_line('g++ --version')
--    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
-+    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
-     print "   jackd ............. %s" % get_version_first_line('jackd --version')
-     print "     path ............ %s" % get_command_path('jackd')
-     print "     flags ........... %s" % get_package_flags("jack")
-diff -baur libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py libffado-2.1.0/support/tools/ffado-sandbox-install.py
---- libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/ffado-sandbox-install.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- 
- #
-diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/support/tools/listirqinfo.py
---- libffado-2.1.0.orig/support/tools/listirqinfo.py	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/listirqinfo.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- 
- #
-diff -baur libffado-2.1.0.orig/tests/dbus_test.py libffado-2.1.0/tests/dbus_test.py
---- libffado-2.1.0.orig/tests/dbus_test.py	2012-09-19 14:18:53.837448529 +0800
-+++ libffado-2.1.0/tests/dbus_test.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2007 by Pieter Palmers
- #               2007-2008 by Arnold Krille
-diff -baur libffado-2.1.0.orig/tests/python/test-eap-ctrl.py libffado-2.1.0/tests/python/test-eap-ctrl.py
---- libffado-2.1.0.orig/tests/python/test-eap-ctrl.py	2012-09-19 14:18:53.837448529 +0800
-+++ libffado-2.1.0/tests/python/test-eap-ctrl.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2009 by Pieter Palmers
- #
diff --git a/testing/libgdata/PKGBUILD b/testing/libgdata/PKGBUILD
deleted file mode 100644
index 7b3ac92be..000000000
--- a/testing/libgdata/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169183 2012-10-18 19:23:59Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgdata
-pkgver=0.13.2
-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' 'gcr' 'gnome-online-accounts')
-makedepends=('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=('3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgee/PKGBUILD b/testing/libgee/PKGBUILD
deleted file mode 100644
index ee1cb1739..000000000
--- a/testing/libgee/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169182 2012-10-18 19:23:57Z jgc $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libgee
-pkgver=0.6.6
-pkgrel=1
-pkgdesc="GObject collection library"
-url="http://live.gnome.org/Libgee"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6b008a6b84332b88f5a12f33d56a3fa3a307946cdd70bc17a403822d4f02e7b')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --disable-static
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgnome-keyring/PKGBUILD b/testing/libgnome-keyring/PKGBUILD
deleted file mode 100644
index a5fec0581..000000000
--- a/testing/libgnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#$Id: PKGBUILD 169181 2012-10-18 19:23:55Z jgc $
-#Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=libgnome-keyring
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME keyring client library"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('dbus-core' 'glib2' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgnomekbd/PKGBUILD b/testing/libgnomekbd/PKGBUILD
deleted file mode 100644
index d19a2dc26..000000000
--- a/testing/libgnomekbd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169282 2012-10-18 19:45:58Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomekbd
-pkgver=3.6.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:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgnomekbd/libgnomekbd.install b/testing/libgnomekbd/libgnomekbd.install
deleted file mode 100644
index a3d820459..000000000
--- a/testing/libgnomekbd/libgnomekbd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD
deleted file mode 100644
index b646e99cc..000000000
--- a/testing/libgpod/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164295 2012-07-29 23:15:52Z tomegun $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgpod
-pkgver=0.8.2
-pkgrel=6
-pkgdesc="A shared library to access the contents of an iPod"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice' 'libplist')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings'
-            'python2-gobject2: python bindings')
-url="http://www.gtkpod.org/libgpod/"
-source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \
-      --enable-udev --with-python=/usr/bin/python2
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/libgssglue/PKGBUILD b/testing/libgssglue/PKGBUILD
deleted file mode 100644
index 382ce696b..000000000
--- a/testing/libgssglue/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 165536 2012-08-23 08:47:06Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=libgssglue
-pkgver=0.4
-pkgrel=1
-pkgdesc="Exports a gssapi interface which calls other random gssapi libraries"
-arch=('i686' 'x86_64')
-url="http://www.citi.umich.edu/projects/nfsv4/linux/"
-license=('BSD')
-depends=('glibc')
-makedepends=('pkgconfig' 'autoconf')
-backup=(etc/gssapi_mech.conf)
-options=('!libtool')
-source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
-        gssapi_mech.conf)
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr 
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir/" install
-
-  # Configuration
-  install -Dm644 "$srcdir"/gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf
-  # install license
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/libgssglue/COPYING
-}
-md5sums=('088797f3180702fa54e786496b32e750'
-         '080be866717e4e06fa6f7d6f43cb395a')
diff --git a/testing/libgssglue/gssapi_mech.conf b/testing/libgssglue/gssapi_mech.conf
deleted file mode 100644
index 9a832ee1b..000000000
--- a/testing/libgssglue/gssapi_mech.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Example /etc/gssapi_mech.conf file
-#
-# GSSAPI Mechanism Definitions
-#
-# This configuration file determines which GSS-API mechanisms
-# the gssd code should use
-#
-# NOTE:
-# The initiaiization function "mechglue_internal_krb5_init"
-# is used for the MIT krb5 gssapi mechanism.  This special
-# function name indicates that an internal function should
-# be used to determine the entry points for the MIT gssapi
-# mechanism funtions.
-#
-# library                               initialization function
-# ================================      ==========================
-# The MIT K5 gssapi library, use special function for initialization.
-/usr/lib/libgssapi_krb5.so             mechglue_internal_krb5_init
-#/usr/lib/libgssapi.so            mechglue_internal_krb5_init
-#
-# The SPKM3 gssapi library function.  Use the function spkm3_gss_initialize.
-# /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so    spkm3_gss_initialize
diff --git a/testing/libgweather/PKGBUILD b/testing/libgweather/PKGBUILD
deleted file mode 100644
index 420e2b212..000000000
--- a/testing/libgweather/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 169180 2012-10-18 19:23:54Z jgc $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-
-pkgname=libgweather
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libsoup-gnome' 'gnome-icon-theme' 'gtk3')
-makedepends=('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
-        no_external_gettext.patch)
-sha256sums=('93c9ef9bba3feb559c02b860909915fa9ffc7c08b4789a825939236e3e84b676'
-            '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533'
-            'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672')
-
-build() {
-    cd "$pkgname-$pkgver"
-
-    patch -Np1 -i "$srcdir/gettext-not-xml.patch"
-    patch -Np1 -i "$srcdir/no_external_gettext.patch"
-    gtkdocize
-    autoreconf -fi
-
-    cd po
-     intltool-update --pot
-    cd ../po-locations
-    intltool-update --gettext-package libgweather-locations --pot
-    cd ..
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-        --enable-locations-compression
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgweather/gettext-not-xml.patch b/testing/libgweather/gettext-not-xml.patch
deleted file mode 100644
index b966c5648..000000000
--- a/testing/libgweather/gettext-not-xml.patch
+++ /dev/null
@@ -1,551 +0,0 @@
-Description: Switch to using gettext to find localized names for locations, instead of shipping very large locale-specific XML files with lots of duplicate information.
-Author: ?
-
-only in patch2:
-unchanged:
-Index: libgweather-3.5.1/configure.ac
-===================================================================
---- libgweather-3.5.1.orig/configure.ac	2012-06-25 03:23:11.000000000 +1200
-+++ libgweather-3.5.1/configure.ac	2012-07-05 10:27:51.457384292 +1200
-@@ -46,6 +46,10 @@
- LT_INIT([dlopen win32-dll disable-static])
- LT_LIB_M
- 
-+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])
-+
- PKG_PROG_PKG_CONFIG([0.19])
- 
- AC_PROG_CC
-@@ -53,13 +57,6 @@
- 
- GLIB_GSETTINGS
- 
--AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AS_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,
-         [AS_HELP_STRING([--enable-locations-compression],
-                         [Compress Locations.xml files])],
-@@ -183,7 +180,7 @@
- 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
-@@ -192,12 +189,6 @@
- ])
- AC_OUTPUT
- 
--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 ***************************************************************************
-@@ -208,6 +199,4 @@
- 	Source code location:		${srcdir}
- 	Compiler:			${CC}
- 	Introspection support:          ${found_introspection}
--	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
--	Locations.xml compression:	${enable_locations_compression}
- " >&2
-Index: libgweather-3.5.1/data/Makefile.am
-===================================================================
---- libgweather-3.5.1.orig/data/Makefile.am	2012-06-06 04:07:53.000000000 +1200
-+++ libgweather-3.5.1/data/Makefile.am	2012-07-05 10:27:51.461384292 +1200
-@@ -4,61 +4,21 @@
- 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 &&								\
--	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
--
--locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt city-fixups.pl station-fixups.pl
--	$(AM_V_GEN)$(srcdir)/build-locationdb.pl
-+$(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) &&				\
-+ 	touch $@
- 
- check:
- 	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
-Index: libgweather-3.5.1/libgweather/gweather-location.c
-===================================================================
---- libgweather-3.5.1.orig/libgweather/gweather-location.c	2012-06-15 08:15:23.000000000 +1200
-+++ libgweather-3.5.1/libgweather/gweather-location.c	2012-07-05 10:27:51.461384292 +1200
-@@ -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"
-@@ -157,10 +160,20 @@
- 
- 	tagname = (const char *) xmlTextReaderConstName (parser->xml);
- 	if (!strcmp (tagname, "name") && !loc->name) {
--	    value = gweather_parser_get_localized_value (parser);
-+	    char *context = NULL;
-+	    context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+	   
-+	    value = gweather_parser_get_value (parser);
- 	    if (!value)
- 		goto error_out;
--	    loc->name = g_strdup (value);
-+
-+	    if (context != NULL) {
-+	    	loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+	    	xmlFree (context);
-+	    }
-+	    else
-+	    	loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+	    
- 	    xmlFree (value);
- 	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- 	    loc->sort_name = g_utf8_casefold (normalized, -1);
-Index: libgweather-3.5.1/libgweather/gweather-timezone.c
-===================================================================
---- libgweather-3.5.1.orig/libgweather/gweather-timezone.c	2011-11-16 01:03:32.000000000 +1300
-+++ libgweather-3.5.1/libgweather/gweather-timezone.c	2012-07-05 10:27:51.461384292 +1200
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -154,7 +155,7 @@
- parse_timezone (GWeatherParser *parser)
- {
-     GWeatherTimezone *zone = NULL;
--    char *id = NULL, *name = NULL;
-+    char *id = NULL, *name = NULL, *context = NULL;
-     int offset = 0, dst_offset = 0;
-     gboolean has_dst = FALSE;
- 
-@@ -177,27 +178,34 @@
- 		continue;
- 	    }
- 
--	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
--		name = gweather_parser_get_localized_value (parser);
-+	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+		context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+		name = gweather_parser_get_value (parser);
-+	    }
- 	    else {
- 		if (xmlTextReaderNext (parser->xml) != 1)
- 		    break;
- 	    }
- 	}
-     }
--
-+	    
-     if (parse_tzdata (id, parser->year_start, parser->year_end,
- 		      &offset, &has_dst, &dst_offset)) {
- 	zone = g_slice_new0 (GWeatherTimezone);
- 	zone->ref_count = 1;
- 	zone->id = g_strdup (id);
--	zone->name = g_strdup (name);
-+	if (context != NULL)
-+		zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+	else
-+		zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- 	zone->offset = offset;
- 	zone->has_dst = has_dst;
- 	zone->dst_offset = dst_offset;
-     }
- 
-     xmlFree (id);
-+    if (context)
-+    	xmlFree (context);
-     if (name)
- 	xmlFree (name);
- 
-Index: libgweather-3.5.1/po-locations/LINGUAS
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/LINGUAS	2012-07-05 10:27:51.461384292 +1200
-@@ -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
-Index: libgweather-3.5.1/po-locations/Makefile.in.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/Makefile.in.in	2012-07-05 10:27:51.461384292 +1200
-@@ -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:
-Index: libgweather-3.5.1/po-locations/POTFILES.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/POTFILES.in	2012-07-05 10:27:51.461384292 +1200
-@@ -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 3ba0d0a48..000000000
--- a/testing/libgweather/libgweather.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/libgweather.schemas ]; then
-    gconfpkg --uninstall libgweather
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libgweather/no_external_gettext.patch b/testing/libgweather/no_external_gettext.patch
deleted file mode 100644
index 64b3c5ad5..000000000
--- a/testing/libgweather/no_external_gettext.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libgweather-3.5.1/configure.ac
-===================================================================
---- libgweather-3.5.1.orig/configure.ac	2012-07-05 10:33:10.277373254 +1200
-+++ libgweather-3.5.1/configure.ac	2012-07-05 10:33:44.957372053 +1200
-@@ -97,9 +97,6 @@
- dnl gettext
- IT_PROG_INTLTOOL([0.50.0])
- 
--AM_GNU_GETTEXT_VERSION([0.18])
--AM_GNU_GETTEXT([external])
--
- GETTEXT_PACKAGE=libgweather-3.0
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
diff --git a/testing/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD
deleted file mode 100644
index 2d9547c84..000000000
--- a/testing/libimobiledevice/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 164283 2012-07-29 21:08:37Z eric $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libimobiledevice
-pkgver=1.1.4
-pkgrel=1
-pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
-url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-depends=('usbmuxd' 'gnutls' 'libgcrypt')
-options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('3f28cbc6a2e30d34685049c0abde5183')
diff --git a/testing/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch
deleted file mode 100644
index c56b095db..000000000
--- a/testing/libimobiledevice/swig-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
---- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false
diff --git a/testing/libkcddb/PKGBUILD b/testing/libkcddb/PKGBUILD
deleted file mode 100644
index 36f6fb0cd..000000000
--- a/testing/libkcddb/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167586 2012-10-02 19:14:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkcddb
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE CDDB library"
-url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'libmusicbrainz5')
-makedepends=('cmake' 'automoc4')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('11a83fcf8e699d787b0c037e50f2031874470d70')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkcompactdisc/PKGBUILD b/testing/libkcompactdisc/PKGBUILD
deleted file mode 100644
index b37c1deb1..000000000
--- a/testing/libkcompactdisc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167587 2012-10-02 19:15:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkcompactdisc
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A library for interfacing with CDs"
-url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('daea966e1d6bc06b3dc7001455e31f5004a05423')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkdcraw/PKGBUILD b/testing/libkdcraw/PKGBUILD
deleted file mode 100644
index 78018d3ae..000000000
--- a/testing/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167581 2012-10-02 19:12:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'lcms')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('022e5e59fb4b0a9ac7942b967f488795a42786e0')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkdcraw/libkdcraw.install b/testing/libkdcraw/libkdcraw.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/libkdcraw/libkdcraw.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/libkdeedu/PKGBUILD b/testing/libkdeedu/PKGBUILD
deleted file mode 100644
index 6d1ddd252..000000000
--- a/testing/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167579 2012-10-02 19:10:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Libraries used by KDE Education applications"
-url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-replaces=('kdeedu-libkdeedu' 'kdeedu-data')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e03310dbb1bcc02095f238fbdd4684a59e98d710')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkdeedu/libkdeedu.install b/testing/libkdeedu/libkdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/libkdeedu/libkdeedu.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/libkexiv2/PKGBUILD b/testing/libkexiv2/PKGBUILD
deleted file mode 100644
index 3b98a4bd6..000000000
--- a/testing/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167582 2012-10-02 19:12:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('60956d88677346bdd4e343b1454a61a2210a39c6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkgapi/PKGBUILD b/testing/libkgapi/PKGBUILD
deleted file mode 100644
index 652d331a4..000000000
--- a/testing/libkgapi/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164626 2012-08-01 14:43:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkgapi
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="A KDE-based library for accessing various Google services via their public API"
-url='https://projects.kde.org/projects/kdereview/libkgoogle'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost')
-replaces=('akonadi-google' 'libkgoogle')
-conflicts=('akonadi-google' 'libkgoogle')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b4cefa643e95f5670997b5001547988f')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkipi/PKGBUILD b/testing/libkipi/PKGBUILD
deleted file mode 100644
index d768ff29b..000000000
--- a/testing/libkipi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 145371 2011-12-22 07:58:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkipi
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="An interface to use kipi-plugins from a KDE application"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('36d9bd240409e4ec3063fe02279671502fb65c26')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libkipi/libkipi.install b/testing/libkipi/libkipi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/libkipi/libkipi.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/libksane/PKGBUILD b/testing/libksane/PKGBUILD
deleted file mode 100644
index 0d20e7022..000000000
--- a/testing/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167584 2012-10-02 19:13:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="An image scanning library"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'sane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e8578ec3a65ba91a8772c88612f61116ee9f38a8')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libksane/libksane.install b/testing/libksane/libksane.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/libksane/libksane.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/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD
deleted file mode 100644
index 57a4e49f1..000000000
--- a/testing/libmpc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 166368 2012-09-07 01:12:26Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=libmpc
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
-arch=('i686' 'x86_64')
-url="http://www.multiprecision.org/"
-license=('LGPL')
-depends=('mpfr>=3.0.0')
-options=('!libtool')
-install=libmpc.install
-source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig})
-md5sums=('b32a2e1a3daa392372fbd586d1ed3679'
-         'c064863fbbb5831ba4f75f1181333862')
-
-build() {
-  cd "${srcdir}/mpc-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/mpc-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/mpc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info
-}
diff --git a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
deleted file mode 100644
index 3bf324728..000000000
--- a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- trunk/configure.ac	2011/02/21 12:18:31	932
-+++ trunk/configure.ac	2011/02/21 16:41:09	936
-@@ -33,7 +33,7 @@
- AC_CANONICAL_HOST
- AC_CONFIG_MACRO_DIR([m4])
- 
--dnl Extra arguments to configure
-+# Extra arguments to configure
- AC_ARG_WITH([mpfr_include],
-             [AC_HELP_STRING([--with-mpfr-include=DIR],
-                             [MPFR include directory])],
-@@ -85,18 +85,19 @@
-              )
- 
- 
--dnl Setup CC and CFLAGS
-+# Setup CC and CFLAGS
-+AC_PROG_CC
-+AC_LANG(C)
- 
--dnl Check for user specification of CC or CFLAGS
-+# Set up LibTool
-+AC_PROG_LIBTOOL
-+
-+# Check for user specification of CC or CFLAGS
- if test -n "$CFLAGS" || test -n "$CC" ; then
-    user_redefine_cc=yes
- fi
- 
--# Check for programs
--AC_PROG_CC
--AC_LANG(C)
--
--dnl Check GMP Header
-+# Check GMP Header
- AC_MSG_CHECKING(for gmp.h)
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include "gmp.h"
-@@ -105,22 +106,19 @@
-  AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
- ])
- 
--dnl Check for GMP CFLAGS in gmp.h
-+# Check for GMP CFLAGS in gmp.h
- if test -z "$user_redefine_cc" ; then
-    MPC_GMP_CC_CFLAGS
- fi
- 
- 
--dnl Configs for Windows DLLs
-+# Configs for Windows DLLs
- case $host in
-   *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      MPC_WINDOWS
- esac
- 
- 
--dnl Finally set up LibTool
--AC_PROG_LIBTOOL
--
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
diff --git a/testing/libmpc/libmpc.install b/testing/libmpc/libmpc.install
deleted file mode 100644
index b0718c745..000000000
--- a/testing/libmpc/libmpc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libmpc.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/libmtp/PKGBUILD b/testing/libmtp/PKGBUILD
deleted file mode 100644
index fdbb15e2b..000000000
--- a/testing/libmtp/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 165531 2012-08-22 22:28:14Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-
-pkgname=libmtp
-pkgver=1.1.4
-pkgrel=1
-pkgdesc="Library implementation of the Media Transfer Protocol"
-arch=("i686" "x86_64")
-url="http://libmtp.sourceforge.net"
-license=('LGPL')
-depends=('libusb' 'libgcrypt')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-udev=/usr/lib/udev
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('27d9bcbc925c1ef84869eb27fdda54e8')
diff --git a/testing/libnice/PKGBUILD b/testing/libnice/PKGBUILD
deleted file mode 100644
index 05890543b..000000000
--- a/testing/libnice/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 500 2009-08-01 11:44:28Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: William Díaz <wdiaz@archlinux.us>
-
-pkgname=libnice
-pkgver=0.1.3
-pkgrel=1
-pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)"
-arch=('i686' 'x86_64')
-url="http://nice.freedesktop.org"
-license=('LGPL')
-depends=('glib2')
-makedepends=('gstreamer' 'gstreamer0.10')
-optdepends=('gstreamer' 'gstreamer0.10')
-options=('!libtool')
-source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('1a0907605f852dcda32a3b3daf38d36c')
diff --git a/testing/libnl/PKGBUILD b/testing/libnl/PKGBUILD
deleted file mode 100644
index 67f071a46..000000000
--- a/testing/libnl/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 162351 2012-06-25 18:39:40Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=libnl
-pkgver=3.2.11
-pkgrel=1
-pkgdesc="Library for applications dealing with netlink sockets"
-arch=(i686 x86_64)
-url="http://www.infradead.org/~tgr/libnl/"
-license=(GPL)
-depends=(glibc)
-backup=(etc/libnl/classid etc/libnl/pktloc)
-options=(!libtool)
-source=("$url/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --sbindir=/usr/bin \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libofx/PKGBUILD b/testing/libofx/PKGBUILD
deleted file mode 100644
index 218fa0cd3..000000000
--- a/testing/libofx/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 165083 2012-08-10 05:02:43Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgbase=libofx
-pkgname=('libofx' 'libofx-doc')
-pkgver=0.9.5
-pkgrel=1
-pkgdesc="API for the OFX banking standard"
-arch=('i686' 'x86_64')
-url="http://libofx.sourceforge.net"
-license=('GPL')
-depends=('opensp' 'curl' 'libxml++')
-checkdepends=('gnupg')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch)
-sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73'
-          '6c327e24543cb8ba901bfb204343a85c68264654')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  patch -p1 -i "$srcdir/libofx-gcc47.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  make check
-}
-
-package_libofx() {
-  options=('!libtool' '!docs')
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-package_libofx-doc() {
-  pkgdesc="Documention of the OFX banking standard API"
-  depends=()
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install-docDATA
-  make -C doc DESTDIR="$pkgdir" install
-}
diff --git a/testing/libofx/libofx-gcc47.patch b/testing/libofx/libofx-gcc47.patch
deleted file mode 100644
index 899fe09e0..000000000
--- a/testing/libofx/libofx-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff
---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp	2011-03-30 22:30:50.000000000 +0000
-+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp	2012-04-17 06:08:38.711940892 +0000
-@@ -37,6 +37,7 @@
- #include <vector>
- #include <algorithm>
- #include <string.h>
-+#include <unistd.h>
- 
- using std::string;
- using std::vector;
diff --git a/testing/libpcap/PKGBUILD b/testing/libpcap/PKGBUILD
deleted file mode 100644
index 44b921483..000000000
--- a/testing/libpcap/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 162349 2012-06-25 18:35:21Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=libpcap
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="A system-independent interface for user-level packet capture"
-arch=('i686' 'x86_64')
-url="http://www.tcpdump.org/"
-license=('BSD')
-depends=('glibc' 'libnl' 'sh' 'libusbx')
-makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}
-        libnl32.patch)
-sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9'
-            '8004a6655fb98acd89f3dea7ce95f182f4874298ce692f5b8f4a7dae65d7993f'
-            '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/libnl32.patch"
-  autoreconf -f -i
-  ./configure --prefix=/usr --enable-ipv6 --with-libnl
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -d -m755 ${pkgdir}/usr/bin
-  make DESTDIR=${pkgdir} install
-  # remove static library
-  rm -rf ${pkgdir}/usr/lib/libpcap.a
-  
-  # backwards compatibility, programs often look for net/bpf.h
-  mkdir -p ${pkgdir}/usr/include/net
-  cd ${pkgdir}/usr/include/net
-  ln -s ../pcap-bpf.h bpf.h
-
-  #install the license
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/testing/libpcap/libnl32.patch b/testing/libpcap/libnl32.patch
deleted file mode 100644
index 633fd003e..000000000
--- a/testing/libpcap/libnl32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in
---- libpcap-1.2.1/configure.in	2012-01-02 01:47:37.000000000 +0100
-+++ libpcap-1.2.1-libnl32/configure.in	2012-02-09 19:29:29.405603749 +0100
-@@ -433,12 +433,13 @@
- 		#
- 		# Try libnl 2.x first.
- 		#
--		AC_CHECK_LIB(nl, nl_socket_alloc,
-+		AC_CHECK_LIB(nl-3, nl_socket_alloc,
- 		[
- 			#
- 			# Yes, we have libnl 2.x.
- 			#
--			LIBS="-lnl-genl -lnl $LIBS"
-+			LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS"
-+			V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)"
- 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
- 			AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
- 		],
diff --git a/testing/libpeas/PKGBUILD b/testing/libpeas/PKGBUILD
deleted file mode 100644
index a226b8b09..000000000
--- a/testing/libpeas/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169178 2012-10-18 19:23:50Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libpeas
-pkgver=1.6.1
-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' 'python2-gobject' 'gjs' 'seed' 'glade')
-optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
-            'seed: gobject-based plugin engine - seed runtime loader')
-options=('!libtool')
-install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $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/libpipeline/PKGBUILD b/testing/libpipeline/PKGBUILD
deleted file mode 100644
index c5493c781..000000000
--- a/testing/libpipeline/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 166762 2012-09-18 18:12:10Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=libpipeline
-pkgver=1.2.2
-pkgrel=1
-pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
-arch=('i686' 'x86_64')
-url="http://libpipeline.nongnu.org/"
-license=('GPL')
-depends=('glibc')
-options=('!libtool')
-source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz)
-md5sums=('4367a3f598d171fd43dfa8620ed16d55')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/testing/libpng/PKGBUILD b/testing/libpng/PKGBUILD
deleted file mode 100644
index 225d2d163..000000000
--- a/testing/libpng/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 161871 2012-06-16 00:25:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Travis Willard <travis@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=libpng
-pkgver=1.5.11
-_apngver=1.5.11
-pkgrel=1
-pkgdesc="A collection of routines used to create PNG format graphics files"
-arch=('i686' 'x86_64')
-url="http://www.libpng.org/pub/png/libpng.html"
-license=('custom')
-depends=('zlib' 'sh')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('57f838299e701b6db9e8389c5602dc18'
-         'e9ddf7670e78ad93f4cc189c884d4f26')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i ../libpng-$_apngver-apng.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png
-  install -m755 png2pnm pnm2png "$pkgdir/usr/bin/"
-  install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/libpst/PKGBUILD b/testing/libpst/PKGBUILD
deleted file mode 100644
index 484181df0..000000000
--- a/testing/libpst/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 163549 2012-07-15 13:17:02Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libpst
-pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.five-ten-sg.com/libpst/"
-license=('GPL')
-makedepends=('python2' 'boost')
-source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-      --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
-  make
-}
-
-package_libpst() {
-  pkgdesc="Outlook .pst file converter"
-  depends=('gcc-libs')
-  optdepends=('boost-libs: for libpst python interface')
-  options=('!libtool' '!docs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libpst-docs() {
-  pkgdesc="Documentation for Outlook .pst file converter"
-  options=('!libtool')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-htmlDATA
-  cd "${srcdir}/${pkgbase}-${pkgver}/html"
-  make DESTDIR="${pkgdir}" install-htmldevelDATA
-}
diff --git a/testing/libpwquality/PKGBUILD b/testing/libpwquality/PKGBUILD
deleted file mode 100644
index b40a35d4b..000000000
--- a/testing/libpwquality/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libpwquality
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="Library for password quality checking and generating random passwords"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/libpwquality/"
-license=('GPL')
-options=('!libtool')
-depends=('cracklib')
-optdepends=('python2: Python bindings')
-makedepends=('python2')
-source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2)
-md5sums=('8827419118064539db70090cbed5cb21')
-
-build() {
-    cd "$pkgname-$pkgver"
-    sed -i -e 's/python setup.py/python2 setup.py/' python/Makefile.in
-
-    PYTHON=python2 ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
deleted file mode 100644
index a014809ff..000000000
--- a/testing/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,711 +0,0 @@
-# $Id: PKGBUILD 169324 2012-10-19 13:28:42Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=3.6.2.2
-pkgver=3.6.2
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
-             'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2'
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	make-pyuno-work-with-system-wide-module-install.diff
-	buildfix.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('ae171ba4633cc72dba4451b1bdd3385e'
-         'cdad0734d247d91a79cb282fd851d2a7'
-         'e9a7e3d35432b72a4603ce094deb6a67'
-         '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '94e7f271e38c976462558b4278590178'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '6097739c841f671cb21332b9cc593ae7'
-         '0d2dcdfbf28d6208751b33057f5361f0'
-         'ce5a1def34578b75959ac31210f031f6'
-         '185d60944ea767075d27247c3162b3bc'
-         '97bf43dda273d79ff90c848ab53b0e3c'
-         '234e91ac65945ce1ab1e3839780e90f7'
-         'abcb1b0a7deaffe13ab3d7ca70becb49'
-         '72790a4103da259a55cadd66db931d00')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-        cd ${srcdir}/libreoffice-core-$_LOver
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-	
-	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
-	ln -s ../libreoffice-translations-$_LOver/translations .
-
-	# buildfixes & bugfixes
-    patch -Np1 -i ${srcdir}/buildfix.diff	# leaves out a broken pdfimport test
-    
-    # fix not upstreamable pyuno paths - patch taken from Debian
-    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-    
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-	
-	# python2 fix
-	export PYTHON=python2
-
-	#autoconf -f
-
-	# non-SMP test build
-	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-
-	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-lockdown\
-		--enable-mergelibs \
-		--enable-opengl \
-		--enable-odk\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libexttextcat \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--disable-mozilla \
-		--without-system-mozilla \
-		--without-system-mozilla-headers \
-		--with-ant-home="/usr/share/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--with-system-hsqldb \
-		--with-alloc=system\
-		--with-system-clucene\
-		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
- 
- # set python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common')
- optdepends=('glu:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
-  # fix environment path to keep compatibility with openjdk6 and openjdk7
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/testing/libreoffice/PKGBUILD.36 b/testing/libreoffice/PKGBUILD.36
deleted file mode 100644
index 71ee72c1c..000000000
--- a/testing/libreoffice/PKGBUILD.36
+++ /dev/null
@@ -1,715 +0,0 @@
-# $Id: PKGBUILD 160067 2012-05-29 19:20:54Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
-_LOver=3.6.0.4
-pkgver=3.6.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-              #'saxon' - currently broken 
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	buildfix.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('67cf97e86c75363238a371f64ef5f606'
-         '8422b0c4c797abeefed3ee4490586dd2'
-         '6cc8fa86be8c657ba23434c6c8d99416'
-         '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         'a9a1db27688bad49418667b434d29c1f'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '6097739c841f671cb21332b9cc593ae7'
-         '0d2dcdfbf28d6208751b33057f5361f0'
-         'ce5a1def34578b75959ac31210f031f6'
-         '185d60944ea767075d27247c3162b3bc'
-         '234e91ac65945ce1ab1e3839780e90f7'
-         'f0e72d0e1bc93a50a3aa9d31350b156c'
-         '867c682b45f477f916786e00c45d7ab7')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-        cd ${srcdir}/libreoffice-core-$_LOver
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-	
-	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
-	ln -s ../libreoffice-translations-$_LOver/translations .
-
-	# buildfixes & bugfixes
-    patch -Np1 -i ${srcdir}/buildfix.diff
-    
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-	
-	# python2 fix
-	export PYTHON=python2
-
-	#autoconf -f
-
-	# non-SMP test build
-	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-
-	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-lockdown\
-		--enable-mergelibs \
-		--enable-opengl \
-		--enable-odk\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libexttextcat \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--disable-mozilla \
-		--without-system-mozilla \
-		--without-system-mozilla-headers \
-		--with-ant-home="/usr/share/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--with-system-hsqldb \
-		--with-alloc=system\
-		--with-system-clucene\
-		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'clucene:          full-text search engine library needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
- 
- # set python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # no file-list so far
- install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
- 
- # create directories from *list.txt file
-# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   install -dm755 ${pkgdir}/${directory/\%dir/}
-# done
-# # install files into the pkg from fakeinstall dir
-# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   dirname=`dirname $file`
-#   # check if directory has been already been created - some are missing like manpages
-#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-#   # mv file from fakeinstall to pkgdir
-#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
-# done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
-  # fix environment path to keep compatibility with openjdk6 and openjdk7
-  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/testing/libreoffice/buildfix.diff b/testing/libreoffice/buildfix.diff
deleted file mode 100644
index 327b10bb1..000000000
--- a/testing/libreoffice/buildfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk	2012-06-07 13:57:10.000000000 +0200
-+++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new	2012-06-09 18:21:03.376024873 +0200
-@@ -49,9 +49,6 @@
-     StaticLibrary_pdfimport_s \
- ))
- 
--$(eval $(call gb_Module_add_check_targets,sdext,\
--    CppunitTest_pdfimport \
--))
- endif
- 
- ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
diff --git a/testing/libreoffice/buildfix_icu49.diff b/testing/libreoffice/buildfix_icu49.diff
deleted file mode 100644
index 7a774dee0..000000000
--- a/testing/libreoffice/buildfix_icu49.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=410307
-
---- i18npool/source/breakiterator/data/char_in.txt
-+++ i18npool/source/breakiterator/data/char_in.txt
-@@ -15,7 +15,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
-@@ -72,7 +72,7 @@
- [^$Control $CR $LF] $Extend;
- 
- [^$Control $CR $LF] $SpacingMark;
--$Prepend [^$Control $CR $LF];
-+# $Prepend [^$Control $CR $LF];
- 
- 
- ## -------------------------------------------------
-@@ -94,7 +94,7 @@
- 
- $Extend      [^$Control $CR $LF];
- $SpacingMark [^$Control $CR $LF];
--[^$Control $CR $LF] $Prepend;
-+# [^$Control $CR $LF] $Prepend;
- 
- 
- ## -------------------------------------------------
---- i18npool/source/breakiterator/data/char.txt
-+++ i18npool/source/breakiterator/data/char.txt
-@@ -16,7 +16,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
diff --git a/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff b/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff
deleted file mode 100644
index ba4850c77..000000000
--- a/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff
+++ /dev/null
@@ -1,360 +0,0 @@
-From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Sun, 13 May 2012 21:41:30 +0000
-Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
-
-i.e.  sync with svn diff -c 31071
-http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
-
-Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
----
-diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
-index 14051d4..ffd590c 100644
---- a/i18npool/qa/cppunit/test_breakiterator.cxx
-+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
-@@ -42,6 +42,7 @@
- #include <unotest/bootstrapfixturebase.hxx>
- 
- #include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
- 
- #include <string.h>
- 
-@@ -58,6 +59,9 @@ public:
-     void testWeak();
-     void testAsian();
-     void testThai();
-+#if TODO
-+    void testNorthernThai();
-+#endif
- 
-     CPPUNIT_TEST_SUITE(TestBreakIterator);
-     CPPUNIT_TEST(testLineBreaking);
-@@ -71,6 +71,9 @@
-     CPPUNIT_TEST(testWeak);
-     CPPUNIT_TEST(testAsian);
-     CPPUNIT_TEST(testThai);
-+#if TODO
-+    CPPUNIT_TEST(testNorthernThai);
-+#endif
-     CPPUNIT_TEST_SUITE_END();
- 
- private:
-@@ -80,28 +83,46 @@
-     uno::Reference<i18n::XBreakIterator> m_xBreak;
- };
- 
--//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation
- void TestBreakIterator::testLineBreaking()
- {
--    ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
--
-     i18n::LineBreakHyphenationOptions aHyphOptions;
-     i18n::LineBreakUserOptions aUserOptions;
-     lang::Locale aLocale;
- 
--    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
--    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
--
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=31271
-     {
--        //Here we want the line break to leave text here) on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+         ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
-+
-+        {
-+            //Here we want the line break to leave text here) on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+        }
-+
-+        {
-+            //Here we want the line break to leave "here)" on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        }
-     }
- 
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=49849
-     {
--        //Here we want the line break to leave "here)" on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD };
-+        ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
-+        ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL"));
-+
-+        {
-+            //Here we want the line break to happen at the whitespace
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1);
-+        }
-     }
- }
- 
-@@ -295,27 +320,29 @@ void TestBreakIterator::testThai()
-     aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
-     aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
- 
--    i18n::Boundary aBounds;
--    {
--        const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
-+    const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
-+}
- 
--#ifdef TODO
--    {
--        const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
--#endif
-+#if TODO
-+void TestBreakIterator::testNorthernThai()
-+{
-+    lang::Locale aLocale;
-+    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod"));
-+    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
-+
-+    const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
- }
-+#endif
- 
- void TestBreakIterator::setUp()
- {
-diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
-new file mode 100644
-index 0000000..8d7598d
---- a/dev/null
-+++ b/i18npool/source/breakiterator/data/README
-@@ -0,0 +1,12 @@
-+The originals of these come from svn checkout
-+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no
-+longer appear in the icu tarballs, but are in icu's svn
-+
-+At various stages these copies have been customized and are not horribly out of
-+sync. It unclear which diffs from the base versions are deliberate and which
-+are now accidental :-(
-+
-+We need to review the various issues referenced in the commits that caused
-+custimizations and see if they're still relevant or not, write regression tests
-+for them, if any are still relavant then apply the changes back on top of the
-+latest versions.
-diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
-index cbabee6..91c8f3d 100644
---- a/i18npool/source/breakiterator/data/line.txt
-+++ b/i18npool/source/breakiterator/data/line.txt
-@@ -61,11 +61,13 @@ $BB = [:LineBreak =  Break_Before:];
- $BK = [:LineBreak =  Mandatory_Break:];
- $B2 = [:LineBreak =  Break_Both:];
- $CB = [:LineBreak =  Contingent_Break:];
-+$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
- $CL = [:LineBreak =  Close_Punctuation:] ;
- $CM = [:LineBreak =  Combining_Mark:];
- $CR = [:LineBreak =  Carriage_Return:];
- $EX = [:LineBreak =  Exclamation:];
- $GL = [:LineBreak =  Glue:];
-+$HL = [:LineBreak =  Hebrew_Letter:];
- $HY = [:LineBreak =  Hyphen:];
- $H2 = [:LineBreak =  H2:];
- $H3 = [:LineBreak =  H3:];
-@@ -77,7 +79,7 @@ $JV = [:LineBreak =  JV:];
- $JT = [:LineBreak =  JT:];
- $LF = [:LineBreak =  Line_Feed:];
- $NL = [:LineBreak =  Next_Line:];
--$NS = [:LineBreak =  Nonstarter:];
-+$NS = [[:LineBreak =  Nonstarter:] $CJ];
- $NU = [:LineBreak =  Numeric:];
- $OP = [[:LineBreak =  Open_Punctuation:] - $DG];
- $PO = [:LineBreak =  Postfix_Numeric:];
-@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
- $CLcm = $CL $CM*;
- $EXcm = $EX $CM*;
- $GLcm = $GL $CM*;
-+$HLcm = $HL $CM*;
- $HYcm = $HY $CM*;
- $H2cm = $H2 $CM*;
- $H3cm = $H3 $CM*;
-@@ -150,6 +153,7 @@ $B2 $CM+;
- $CL $CM+;
- $EX $CM+;
- $GL $CM+;
-+$HL $CM+;
- $HY $CM+;
- $H2 $CM+;
- $H3 $CM+;
-@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
- #            so for this one case we need to manually list out longer sequences.
- #
- $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
--$AL_FOLLOW_CM   = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
-+$AL_FOLLOW_CM   = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
- $AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
- 
- 
-@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
- $BBcm [^$CB];                                  #  $BB  x
- $BBcm $LB20NonBreaks $CM*;
- 
-+# LB 21a Don't break after Hebrew + Hyphen
-+#   HL (HY | BA) x
-+#  
-+$HLcm ($HYcm | $BAcm) [^$CB]?;
-+
- # LB 22
--$ALcm    $INcm;
-+($ALcm | $HLcm) $INcm;
- $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
- $IDcm    $INcm;
- $INcm    $INcm;
-@@ -331,16 +340,18 @@ $NUcm    $INcm;
- # $LB 23
- $IDcm  $POcm;
- $ALcm  $NUcm;       # includes $LB19
-+$HLcm  $NUcm;
- $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
- $NUcm  $ALcm;
-+$NUcm  $HLcm;
- 
- #
- # LB 24
- #
- $PRcm $IDcm;
- $ALcm $PRcm;
--$PRcm $ALcm;
--$POcm $ALcm;
-+$PRcm ($ALcm | $HLcm);
-+$POcm ($ALcm | $HLcm);
- 
- #
- # LB 25   Numbers.
-@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
- 
- # LB 28   Do not break between alphabetics
- #
--$ALcm $ALcm;
--$CM+ $ALcm;      # The $CM+ is from rule 10, and unattached CM is treated as AL
-+($ALcm | $HLcm) ($ALcm | $HLcm);
-+$CM+ ($ALcm | $HLcm);      # The $CM+ is from rule 10, an unattached CM is treated as AL
- 
- # LB 29
- $IScm ($ALcm | $NUcm);
-@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
- # Rule 30   Do not break between letters, numbers or ordinary symbols
- #           and opening or closing punctuation
- #
--($ALcm | $NUcm) $OPcm;
-+($ALcm | $HLcm | $NUcm) $OPcm;
- $CM+ $OPcm;
--$CLcm ($ALcm | $NUcm);
--
--
-+$CLcm ($ALcm | $HLcm | $NUcm);
- 
- #
- #  Reverse Rules.
-@@ -391,6 +400,7 @@ $CM+ $B2;
- $CM+ $CL;
- $CM+ $EX;
- $CM+ $GL;
-+$CM+ $HL;
- $CM+ $HY;
- $CM+ $H2;
- $CM+ $H3;
-@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
- $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
- [^$CB] $CM* $BB;                                      # 
- 
--
-+# LB21a
-+[^$CB] $CM* ($HY | $BA) $CM* $HL;
- 
- # LB 22
--$CM* $IN $CM* $ALPlus;
-+$CM* $IN $CM* ($ALPlus | $HL);
- $CM* $IN $CM* $ID;
- $CM* $IN $CM* $IN;
- $CM* $IN $CM* $NU;
- 
- # LB 23
- $CM* $PO $CM* $ID;
--$CM* $NU $CM* $ALPlus;
--$CM* $ALPlus $CM* $NU;
-+$CM* $NU $CM* ($ALPlus | $HL);
-+$CM* ($ALPlus | $HL) $CM* $NU;
- 
- # LB 24
- $CM* $ID $CM* $PR;
- $CM* $PR $CM* $ALPlus;
--$CM* $ALPlus $CM* $PR;
--$CM* $ALPlus $CM* $PO;
-+$CM* ($ALPlus | $HL) $CM* $PR;
-+$CM* ($ALPlus | $HL) $CM* $PO;
- 
- $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
- $CM* $NU+ $CM* $HY+ / $SP;
-@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
- $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
- 
- # LB 28
--$CM* $ALPlus $CM* $ALPlus;
--
-+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
- 
- # LB 29
- $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
- 
- # LB 30
--$CM* $OP $CM* ($NU | $ALPlus);
--$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
-+$CM* $OP $CM* ($ALPlus | $HL | $NU);
-+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
- 
- 
- ## -------------------------------------------------
-@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
- $SP+ $CM* $CL;
- $SP+ $CM* $B2;
- 
-+# LB 21
-+$CM* ($HY | $BA) $CM* $HL;
-+
- # LB 18
- ($CM* ($IS | $SY))+ $CM* $NU;
- $CL $CM* ($NU | $IS | $SY);
-@@ -629,6 +642,6 @@ $dictionary $dictionary;
- #  turn off rule chaining.  We don't want to move more
- #  than necessary.
- #
--[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
-+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
- $dictionary $dictionary;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/libreoffice/git_fixes.diff b/testing/libreoffice/git_fixes.diff
deleted file mode 100644
index a4cd891cb..000000000
--- a/testing/libreoffice/git_fixes.diff
+++ /dev/null
@@ -1,743 +0,0 @@
-From 427529801dee122250e44d2311b34651db92bbdb Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 21 Aug 2012 16:55:11 +0000
-Subject: Typo
-
-Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106
-(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b)
-
-Signed-off-by: Eike Rathke <erack@redhat.com>
----
-diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
-index d929787..55ebaca 100644
---- a/desktop/source/app/app.cxx
-+++ b/desktop/source/app/app.cxx
-@@ -194,7 +194,7 @@ void removeTree(OUString const & url) {
-     osl::FileBase::RC rc = osl::Directory::remove(url);
-     SAL_WARN_IF(
-         rc != osl::FileBase::E_None, "desktop",
--        "cannot remove directory " << url << ": " +rc);
-+        "cannot remove directory " << url << ": " << +rc);
-         // at least on Windows XP removing some existing directories fails with
-         // osl::FileBase::E_ACCESS because they are read-only; but keeping those
-         // directories around should be harmless once they are empty
---
-cgit v0.9.0.2-2-gbebe
-From b4f8acb41165a28b2db47acd3c6b624a4c507c54 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Fri, 24 Aug 2012 14:06:15 +0000
-Subject: Fix removeRdbFiles (caused extension update to fail)
-
-removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the
-corresponding component (.so, .jar, etc.), but not the .rdb file.  So removing
-an .rdb file silently failed to remove the corresponding implementations, so re-
-installing a similar enough .rdb (as typically happens during extension update)
-would fail due to duplicate implementation names.
-
-Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe
-Reviewed-on: https://gerrit.libreoffice.org/476
-Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
----
-diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
-index c3bdba3..7fd1e4a 100644
---- a/cppuhelper/source/defaultbootstrap.cxx
-+++ b/cppuhelper/source/defaultbootstrap.cxx
-@@ -130,9 +130,10 @@ struct ImplementationInfo: private boost::noncopyable {
-         rtl::OUString const & theName, rtl::OUString const & theLoader,
-         rtl::OUString const & theUri, rtl::OUString const & thePrefix,
-         css::uno::Reference< css::uno::XComponentContext > const &
--            theAlienContext):
-+            theAlienContext,
-+        rtl::OUString const & theRdbFile):
-         name(theName), loader(theLoader), uri(theUri), prefix(thePrefix),
--        alienContext(theAlienContext)
-+        alienContext(theAlienContext), rdbFile(theRdbFile)
-     {}
- 
-     explicit ImplementationInfo(rtl::OUString const & theName): name(theName) {}
-@@ -142,6 +143,7 @@ struct ImplementationInfo: private boost::noncopyable {
-     rtl::OUString const uri;
-     rtl::OUString const prefix;
-     css::uno::Reference< css::uno::XComponentContext > const alienContext;
-+    rtl::OUString const rdbFile;
-     std::vector< rtl::OUString > services;
-     std::vector< rtl::OUString > singletons;
- };
-@@ -149,12 +151,12 @@ struct ImplementationInfo: private boost::noncopyable {
- struct Implementation: private boost::noncopyable {
-     Implementation(
-         rtl::OUString const & name, rtl::OUString const & loader,
--        rtl::OUString const & uri,
--        rtl::OUString const & prefix = rtl::OUString(),
--        css::uno::Reference< css::uno::XComponentContext > const &
--            alienContext
--                = css::uno::Reference< css::uno::XComponentContext >()):
--        info(new ImplementationInfo(name, loader, uri, prefix, alienContext)),
-+        rtl::OUString const & uri, rtl::OUString const & prefix,
-+        css::uno::Reference< css::uno::XComponentContext > const & alienContext,
-+        rtl::OUString const & rdbFile):
-+        info(
-+            new ImplementationInfo(
-+                name, loader, uri, prefix, alienContext, rdbFile)),
-         loaded(false)
-     {}
- 
-@@ -466,7 +468,7 @@ void Parser::handleImplementation() {
-     implementation_.reset(
-         new Implementation(
-             attrImplementation_, attrLoader_, attrUri_, attrPrefix_,
--            alienContext_));
-+            alienContext_, reader_.getUrl()));
-     if (!data_->namedImplementations.insert(
-             NamedImplementations::value_type(
-                 attrImplementation_, implementation_)).
-@@ -1502,7 +1504,9 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
-         boost::shared_ptr< Implementation > impl(
-             new Implementation(
-                 name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"),
--                readLegacyRdbString(uri, implKey, "UNO/LOCATION")));
-+                readLegacyRdbString(uri, implKey, "UNO/LOCATION"),
-+                rtl::OUString(),
-+                css::uno::Reference< css::uno::XComponentContext >(), uri));
-         if (!data_.namedImplementations.insert(
-                 NamedImplementations::value_type(name, impl)).
-             second)
-@@ -1744,7 +1748,7 @@ void ServiceManager::removeRdbFiles(std::vector< rtl::OUString > const & uris) {
-                  j != data_.namedImplementations.end();)
-             {
-                 assert(j->second.get() != 0);
--                if (j->second->info->uri == *i) {
-+                if (j->second->info->rdbFile == *i) {
-                     clear.push_back(j->second);
-                     //TODO: The below leaves data_ in an inconsistent state upon
-                     // exceptions:
---
-cgit v0.9.0.2-2-gbebe
-From 6d261e7aac12a876acb6496085e5329632595d39 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Fri, 24 Aug 2012 14:45:20 +0000
-Subject: fdo#53968 etc.: Fix more "doesn't start after upgrade" problems
-
-* fdo#53968 revealed that multiple soffice.bin instances can run removeTree in
-  parallel.  Therefore, demoted failures from exceptions to SAL_WARNs.  (And
-  keeping fingers crossed.)
-
-* a8cdce148c76c93c5d41820610d6e6ac175e03a7 "fdo#53655: Ignore failure to remove
-  directories (as happens on Windows XP)" was due to a forgotten
-  osl::Directory::close before calling osl::Directory::remove after all.
-
-* UserInstallations have been seen in the wild where no extensions were
-  installed per-user (any longer), but user/uno_packages/cache/registry/
-  com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
-  contained data nevertheless.  To reliably clean out any old junk,
-  refreshBundledExtensionsDir has been extended to cleanExtensionsCache which in
-  tandem with an extended Desktop::SynchronizeExtensionRepositories now cleanly
-  re-installs all bundled, shared, and per-user extensions after a LO upgrade.
-
-Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0
-Reviewed-on: https://gerrit.libreoffice.org/477
-Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
----
-diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
-index 25b6352..c830b02 100644
---- a/desktop/inc/app.hxx
-+++ b/desktop/inc/app.hxx
-@@ -203,6 +203,7 @@ class Desktop : public Application
- 
-         sal_Bool                        m_bMinimized;
-         sal_Bool                        m_bInvisible;
-+        bool                            m_bCleanedExtensionCache;
-         bool                            m_bServicesRegistered;
-         sal_uInt16                          m_nAppEvents;
-         BootstrapError                  m_aBootstrapError;
-diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
-index 55ebaca..5fb653b 100644
---- a/desktop/source/app/app.cxx
-+++ b/desktop/source/app/app.cxx
-@@ -147,77 +147,81 @@ namespace {
- 
- void removeTree(OUString const & url) {
-     osl::Directory dir(url);
--    switch (dir.open()) {
-+    osl::FileBase::RC rc = dir.open();
-+    switch (rc) {
-     case osl::FileBase::E_None:
-         break;
-     case osl::FileBase::E_NOENT:
-         return; //TODO: SAL_WARN if recursive
-     default:
--        throw css::uno::RuntimeException(
--            "cannot open directory " + url,
--            css::uno::Reference< css::uno::XInterface >());
-+        SAL_WARN("desktop", "cannot open directory " << url << ": " << +rc);
-+        return;
-     }
-     for (;;) {
-         osl::DirectoryItem i;
--        osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
-+        rc = dir.getNextItem(i, SAL_MAX_UINT32);
-         if (rc == osl::FileBase::E_NOENT) {
-             break;
-         }
-         if (rc != osl::FileBase::E_None) {
--            throw css::uno::RuntimeException(
--                ("cannot iterate directory " + url + ": "
--                 + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop","cannot iterate directory " << url << ": " << +rc);
-+            break;
-         }
-         osl::FileStatus stat(
-             osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
-             osl_FileStatus_Mask_FileURL);
-         rc = i.getFileStatus(stat);
-         if (rc != osl::FileBase::E_None) {
--            throw css::uno::RuntimeException(
--                ("cannot stat in directory " + url + ": "
--                 + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop", "cannot stat in directory " << url << ": " << +rc);
-+            continue;
-         }
-         if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks
-             removeTree(stat.getFileURL());
-         } else {
-             rc = osl::File::remove(stat.getFileURL());
--            if (rc != osl::FileBase::E_None) {
--                throw css::uno::RuntimeException(
--                    ("cannot remove file " + stat.getFileURL() + ": "
--                     + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                    css::uno::Reference< css::uno::XInterface >());
--            }
-+            SAL_WARN_IF(
-+                rc != osl::FileBase::E_None, "desktop",
-+                "cannot remove file " << stat.getFileURL() << ": " << +rc);
-         }
-     }
--    osl::FileBase::RC rc = osl::Directory::remove(url);
-+    if (dir.isOpen()) {
-+        rc = dir.close();
-+        SAL_WARN_IF(
-+            rc != osl::FileBase::E_None, "desktop",
-+            "cannot close directory " << url << ": " << +rc);
-+    }
-+    rc = osl::Directory::remove(url);
-     SAL_WARN_IF(
-         rc != osl::FileBase::E_None, "desktop",
-         "cannot remove directory " << url << ": " << +rc);
--        // at least on Windows XP removing some existing directories fails with
--        // osl::FileBase::E_ACCESS because they are read-only; but keeping those
--        // directories around should be harmless once they are empty
- }
- 
--// Remove any existing UserInstallation's user/extensions/bundled cache
--// remaining from old installations.  Apparently due to the old
--// share/prereg/bundled mechanism (disabled since
--// 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
--// share/prereg/bundled to avoid startup crashes"), that cache could contain
--// corrupted information (like a UNO component registered twice, which got
--// changed from active to passive registration in one LO version, but the
--// version of the corresponding bundled extension only incremented in a later LO
--// version).  At least in theory, this function could be removed again once no
--// UserInstallation can be poisoned by that old share/prereg/bundled mechanism
--// any more.  (But then Desktop::SynchronizeExtensionRepositories might need to
--// be revisited, see 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force
--// ExtensionManager resync when the implementation changes" which effectively
--// got reverted again now.  Now, a mismatch between a UserInstallation's
--// user/extensions/bundled and an installation's share/extensions will always be
--// detected here and lead to a removal of user/extensions/bundled, so that
--// Desktop::SynchronizeExtensionRepositories will then definitely resync
--// share/extensions.)
-+// Remove any existing UserInstallation's extensions cache data remaining from
-+// old installations.  This addresses at least two problems:
-+//
-+// For one, apparently due to the old share/prereg/bundled mechanism (disabled
-+// since 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
-+// share/prereg/bundled to avoid startup crashes"), the user/extensions/bundled
-+// cache could contain corrupted information (like a UNO component registered
-+// twice, which got changed from active to passive registration in one LO
-+// version, but the version of the corresponding bundled extension only
-+// incremented in a later LO version).
-+//
-+// For another, UserInstallations have been seen in the wild where no extensions
-+// were installed per-user (any longer), but user/uno_packages/cache/registry/
-+// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
-+// contained data nevertheless.
-+//
-+// When a LO upgrade is detected (i.e., no/ user/extensions/bundled/buildid or
-+// one containing an old build ID), then user/extensions/bundled,
-+// user/extensions/shared, and user/uno_packages/cache/registry/
-+// com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are
-+// removed.  That should prevent any problems starting the service manager due
-+// to old junk.  Later on in Desktop::SynchronizeExtensionRepositories, the
-+// removed cache data is recreated.
-+//
- // As a special case, if you create a UserInstallation with LO >= 3.6.1, then
- // run an old LO <= 3.5.x using share/prereg/bundled on the same
- // UserInstallation (so that it partially overwrites user/extensions/bundled,
-@@ -230,33 +234,50 @@ void removeTree(OUString const & url) {
- // <= 3.5.x messed with user/extensions/bundled in the meantime, then it would
- // have rewritten the unorc (dropping the token), and LO >= 3.6.1 can detect
- // that.
--void refreshBundledExtensionsDir() {
-+//
-+// Multiple instances of soffice.bin can execute this code in parallel for a
-+// single UserInstallation, as it is called before OfficeIPCThread is set up.
-+// Therefore, any errors here only lead to SAL_WARNs.
-+//
-+// At least in theory, this function could be removed again once no
-+// UserInstallation can be poisoned by old junk any more.
-+bool cleanExtensionCache() {
-     OUString buildId(
-         "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}");
-     rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure
--    OUString dir("$BUNDLED_EXTENSIONS_USER");
--    rtl::Bootstrap::expandMacros(dir); //TODO: detect failure
--    OUString url(dir + "/buildid");
--    OUString nonPrereg(
--        "${$BUNDLED_EXTENSIONS_USER/registry/"
--        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc:"
--        "LIBO_NON_PREREG_BUNDLED_EXTENSIONS}");
--    rtl::Bootstrap::expandMacros(nonPrereg);
--    if (nonPrereg == "TRUE") {
--        osl::File f(url);
--        switch (f.open(osl_File_OpenFlag_Read)) {
-+    OUString extDir(
-+        "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
-+        ":UserInstallation}/user/extensions");
-+    rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure
-+    OUString bundledDir = extDir + "/bundled";
-+    OUString buildIdFile(bundledDir + "/buildid");
-+    OUString bundledRcFile(
-+        "$BUNDLED_EXTENSIONS_USER/registry/"
-+        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc");
-+    rtl::Bootstrap::expandMacros(bundledRcFile); //TODO: detect failure
-+    rtl::Bootstrap bundledRc(bundledRcFile);
-+    OUString nonPrereg;
-+    if (bundledRc.getHandle() == 0
-+        || (bundledRc.getFrom("LIBO_NON_PREREG_BUNDLED_EXTENSIONS", nonPrereg)
-+            && nonPrereg == "TRUE"))
-+    {
-+        osl::File f(buildIdFile);
-+        osl::FileBase::RC rc = f.open(osl_File_OpenFlag_Read);
-+        switch (rc) {
-         case osl::FileBase::E_None:
-             {
-                 rtl::ByteSequence s1;
--                osl::FileBase::RC rc = f.readLine(s1);
--                if (f.close() != osl::FileBase::E_None) {
--                    SAL_WARN(
--                        "desktop", "cannot close " + url + " after reading");
--                }
-+                rc = f.readLine(s1);
-+                osl::FileBase::RC rc2 = f.close();
-+                SAL_WARN_IF(
-+                    rc2 != osl::FileBase::E_None, "desktop",
-+                    "cannot close " << buildIdFile << " after reading: "
-+                        << +rc2);
-                 if (rc != osl::FileBase::E_None) {
--                    throw css::uno::RuntimeException(
--                        "cannot read from " + url,
--                        css::uno::Reference< css::uno::XInterface >());
-+                    SAL_WARN(
-+                        "desktop",
-+                        "cannot read from " << buildIdFile << ": " << +rc);
-+                    break;
-                 }
-                 OUString s2(
-                     reinterpret_cast< char const * >(s1.getConstArray()),
-@@ -264,53 +285,56 @@ void refreshBundledExtensionsDir() {
-                     // using ISO 8859-1 avoids any and all conversion errors;
-                     // the content should only be a subset of ASCII, anyway
-                 if (s2 == buildId) {
--                    return;
-+                    return false;
-                 }
-                 break;
-             }
-         case osl::FileBase::E_NOENT:
-             break;
-         default:
--            throw css::uno::RuntimeException(
--                "cannot open " + url + " for reading",
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop",
-+                "cannot open " << buildIdFile << " for reading: " << +rc);
-+            break;
-         }
-     }
--    removeTree(dir);
--    switch (osl::Directory::createPath(dir)) {
--    case osl::FileBase::E_None:
--    case osl::FileBase::E_EXIST:
--        break;
--    default:
--        throw css::uno::RuntimeException(
--            "cannot create path " + dir,
--            css::uno::Reference< css::uno::XInterface >());
--    }
--    osl::File f(url);
--    if (f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create) !=
--        osl::FileBase::E_None)
--    {
--        throw css::uno::RuntimeException(
--            "cannot open " + url + " for writing",
--            css::uno::Reference< css::uno::XInterface >());
-+    removeTree(extDir);
-+    OUString userRcFile(
-+        "$UNO_USER_PACKAGES_CACHE/registry/"
-+        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc");
-+    rtl::Bootstrap::expandMacros(userRcFile); //TODO: detect failure
-+    osl::FileBase::RC rc = osl::File::remove(userRcFile);
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None && rc != osl::FileBase::E_NOENT, "desktop",
-+        "cannot remove file " << userRcFile << ": " << +rc);
-+    rc = osl::Directory::createPath(bundledDir);
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST, "desktop",
-+        "cannot create path " << bundledDir << ": " << +rc);
-+    osl::File f(buildIdFile);
-+    rc = f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
-+    if (rc != osl::FileBase::E_None) {
-+        SAL_WARN(
-+            "desktop",
-+            "cannot open " << buildIdFile << " for writing: " << +rc);
-+        return true;
-     }
-     rtl::OString buf(OUStringToOString(buildId, RTL_TEXTENCODING_UTF8));
-         // using UTF-8 avoids almost all conversion errors (and buildid
-         // containing single surrogate halves should never happen, anyway); the
-         // content should only be a subset of ASCII, anyway
--    sal_uInt64 n;
--    if (f.write(buf.getStr(), buf.getLength(), n) != osl::FileBase::E_None
--        || n != static_cast< sal_uInt32 >(buf.getLength()))
--    {
--        throw css::uno::RuntimeException(
--            "cannot write to " + url,
--            css::uno::Reference< css::uno::XInterface >());
--    }
--    if (f.close() != osl::FileBase::E_None) {
--        throw css::uno::RuntimeException(
--            "cannot close " + url + " after writing",
--            css::uno::Reference< css::uno::XInterface >());
--    }
-+    sal_uInt64 n = 0;
-+    rc = f.write(buf.getStr(), buf.getLength(), n);
-+    SAL_WARN_IF(
-+        (rc != osl::FileBase::E_None
-+         || n != static_cast< sal_uInt32 >(buf.getLength())),
-+        "desktop",
-+        "cannot write to " << buildIdFile << ": " << +rc << ", " << n);
-+    rc = f.close();
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None, "desktop",
-+        "cannot close " << buildIdFile << " after writing: " << +rc);
-+    return true;
- }
- 
- }
-@@ -538,7 +562,8 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr )
- }
- 
- Desktop::Desktop()
--: m_bServicesRegistered( false )
-+: m_bCleanedExtensionCache( false )
-+, m_bServicesRegistered( false )
- , m_aBootstrapError( BE_OK )
- {
-     RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" );
-@@ -553,7 +578,7 @@ void Desktop::Init()
-     RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" );
-     SetBootstrapStatus(BS_OK);
- 
--    refreshBundledExtensionsDir();
-+    m_bCleanedExtensionCache = cleanExtensionCache();
- 
-     // We need to have service factory before going further, but see fdo#37195.
-     // Doing this will mmap common.rdb, making it not overwritable on windows,
-diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
-index dd01d9b..a6221a9 100644
---- a/desktop/source/app/check_ext_deps.cxx
-+++ b/desktop/source/app/check_ext_deps.cxx
-@@ -51,6 +51,7 @@
- #include "com/sun/star/deployment/ExtensionManager.hpp"
- #include "com/sun/star/deployment/LicenseException.hpp"
- #include "com/sun/star/deployment/ui/LicenseDialog.hpp"
-+#include <com/sun/star/task/OfficeRestartManager.hpp>
- #include <com/sun/star/task/XJob.hpp>
- #include <com/sun/star/task/XJobExecutor.hpp>
- #include <com/sun/star/task/XInteractionApprove.hpp>
-@@ -77,12 +78,15 @@ class SilentCommandEnv
-                                       task::XInteractionHandler,
-                                       ucb::XProgressHandler >
- {
-+    uno::Reference<uno::XComponentContext> mxContext;
-     Desktop    *mpDesktop;
-     sal_Int32   mnLevel;
-     sal_Int32   mnProgress;
- 
- public:
--             SilentCommandEnv( Desktop* pDesktop );
-+    SilentCommandEnv(
-+        uno::Reference<uno::XComponentContext> const & xContext,
-+        Desktop* pDesktop );
-     virtual ~SilentCommandEnv();
- 
-     // XCommandEnvironment
-@@ -105,12 +109,14 @@ public:
- };
- 
- //-----------------------------------------------------------------------------
--SilentCommandEnv::SilentCommandEnv( Desktop* pDesktop )
--{
--    mpDesktop = pDesktop;
--    mnLevel = 0;
--    mnProgress = 25;
--}
-+SilentCommandEnv::SilentCommandEnv(
-+    uno::Reference<uno::XComponentContext> const & xContext,
-+    Desktop* pDesktop ):
-+    mxContext( xContext ),
-+    mpDesktop( pDesktop ),
-+    mnLevel( 0 ),
-+    mnProgress( 25 )
-+{}
- 
- //-----------------------------------------------------------------------------
- SilentCommandEnv::~SilentCommandEnv()
-@@ -144,10 +150,9 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe
- 
-     if ( request >>= licExc )
-     {
--        uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext();
-         uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
-             deployment::ui::LicenseDialog::create(
--            xContext, VCLUnoHelper::GetInterface( NULL ),
-+            mxContext, VCLUnoHelper::GetInterface( NULL ),
-             licExc.ExtensionName, licExc.Text ) );
-         sal_Int16 res = xDialog->execute();
-         if ( res == ui::dialogs::ExecutableDialogResults::CANCEL )
-@@ -416,7 +421,20 @@ sal_Bool Desktop::CheckExtensionDependencies()
- void Desktop::SynchronizeExtensionRepositories()
- {
-     RTL_LOGFILE_CONTEXT(aLog,"desktop (jl) ::Desktop::SynchronizeExtensionRepositories");
--    dp_misc::syncRepositories( new SilentCommandEnv( this ) );
-+    uno::Reference< uno::XComponentContext > context(
-+        comphelper_getProcessComponentContext());
-+    uno::Reference< ucb::XCommandEnvironment > silent(
-+        new SilentCommandEnv(context, this));
-+    if (m_bCleanedExtensionCache) {
-+        deployment::ExtensionManager::get(context)->reinstallDeployedExtensions(
-+            true, "user", Reference<task::XAbortChannel>(), silent);
-+        task::OfficeRestartManager::get(context)->requestRestart(
-+            silent->getInteractionHandler());
-+    } else {
-+        // reinstallDeployedExtensions above already calls syncRepositories
-+        // internally:
-+        dp_misc::syncRepositories(m_bCleanedExtensionCache, silent);
-+    }
- }
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-index 29ded17..7795e309 100644
---- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-@@ -1124,7 +1124,7 @@ void ExtensionCmdQueue::acceptLicense( const uno::Reference< deployment::XPackag
- 
- void ExtensionCmdQueue::syncRepositories( const uno::Reference< uno::XComponentContext > &xContext )
- {
--    dp_misc::syncRepositories( new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) );
-+    dp_misc::syncRepositories( false, new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) );
- }
- 
- void ExtensionCmdQueue::stop()
-diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
-index 29fd140..06e67aa 100644
---- a/desktop/source/deployment/inc/dp_misc.h
-+++ b/desktop/source/deployment/inc/dp_misc.h
-@@ -154,8 +154,10 @@ void TRACE(::rtl::OUString const & sText);
-     recently added or removed.
- */
- DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
--void syncRepositories(::com::sun::star::uno::Reference<
--                      ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
-+void syncRepositories(
-+    bool force,
-+    ::com::sun::star::uno::Reference<
-+        ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
- 
- }
- 
-diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
-index 68403f1..b3c21b4 100644
---- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
-+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
-@@ -1205,9 +1205,10 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
-    }
- }
- 
--//only to be called from unopkg!!!
-+// Only to be called from unopkg or soffice bootstrap (with force=true in the
-+// latter case):
- void ExtensionManager::reinstallDeployedExtensions(
--    OUString const & repository,
-+    sal_Bool force, OUString const & repository,
-     Reference<task::XAbortChannel> const & xAbortChannel,
-     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-     throw (deploy::DeploymentException,
-@@ -1220,10 +1221,11 @@ void ExtensionManager::reinstallDeployedExtensions(
-             xPackageManager = getPackageManager(repository);
- 
-         ::osl::MutexGuard guard(getMutex());
--        xPackageManager->reinstallDeployedPackages(xAbortChannel, xCmdEnv);
-+        xPackageManager->reinstallDeployedPackages(
-+            force, xAbortChannel, xCmdEnv);
-         //We must sync here, otherwise we will get exceptions when extensions
-         //are removed.
--        dp_misc::syncRepositories(xCmdEnv);
-+        dp_misc::syncRepositories(force, xCmdEnv);
-         const uno::Sequence< Reference<deploy::XPackage> > extensions(
-             xPackageManager->getDeployedPackages(xAbortChannel, xCmdEnv));
- 
-diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
-index 22e2d41..ec1edbc 100644
---- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
-+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
-@@ -182,7 +182,7 @@ public:
-             css::uno::RuntimeException);
- 
-     virtual void SAL_CALL reinstallDeployedExtensions(
--        ::rtl::OUString const & repository,
-+        sal_Bool force, ::rtl::OUString const & repository,
-         css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel,
-         css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
-         throw (
-diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
-index 8a08320c..8e3d109 100644
---- a/desktop/source/deployment/manager/dp_manager.cxx
-+++ b/desktop/source/deployment/manager/dp_manager.cxx
-@@ -1164,14 +1164,14 @@ PackageManagerImpl::getDeployedPackages(
- //ToDo: the function must not call registerPackage, do this in
- //XExtensionManager.reinstallDeployedExtensions
- void PackageManagerImpl::reinstallDeployedPackages(
--    Reference<task::XAbortChannel> const &  /*xAbortChannel*/,
-+    sal_Bool force, Reference<task::XAbortChannel> const &  /*xAbortChannel*/,
-     Reference<XCommandEnvironment> const & xCmdEnv_ )
-     throw (deployment::DeploymentException,
-            CommandFailedException, CommandAbortedException,
-            lang::IllegalArgumentException, RuntimeException)
- {
-     check();
--    if (office_is_running())
-+    if (!force && office_is_running())
-         throw RuntimeException(
-             OUSTR("You must close any running Office process before "
-                   "reinstalling packages!"), static_cast<OWeakObject *>(this) );
-diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
-index 3b335d7..3c7f8d9 100644
---- a/desktop/source/deployment/manager/dp_manager.h
-+++ b/desktop/source/deployment/manager/dp_manager.h
-@@ -236,6 +236,7 @@ public:
-                css::uno::RuntimeException);
- 
-     virtual void SAL_CALL reinstallDeployedPackages(
-+        sal_Bool force,
-         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-         throw (css::deployment::DeploymentException,
-diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
-index b225db6..9ed579f 100644
---- a/desktop/source/deployment/misc/dp_misc.cxx
-+++ b/desktop/source/deployment/misc/dp_misc.cxx
-@@ -591,7 +591,7 @@ void TRACE(::rtl::OString const & sText)
- }
- 
- void syncRepositories(
--    Reference<ucb::XCommandEnvironment> const & xCmdEnv)
-+    bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv)
- {
-     OUString sDisable;
-     ::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() );
-@@ -602,7 +602,8 @@ void syncRepositories(
-     //synchronize shared before bundled otherewise there are
-     //more revoke and registration calls.
-     sal_Bool bModified = false;
--    if (needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
-+    if (force
-+        || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
-         || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"))))
-     {
-         xExtensionManager =
-diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-index 43faed5..ef16ea1 100644
---- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-@@ -392,7 +392,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
-         //synching is done in XExtensionManager.reinstall
-         if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall"))
-             && ! dp_misc::office_is_running())
--            dp_misc::syncRepositories(xCmdEnv);
-+            dp_misc::syncRepositories(false, xCmdEnv);
- 
-         if ( subcmd_add || subCommand == "remove" )
-         {
-@@ -436,7 +436,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
-                      RTL_CONSTASCII_STRINGPARAM("reinstall") ))
-         {
-             xExtensionManager->reinstallDeployedExtensions(
--                repository, Reference<task::XAbortChannel>(), xCmdEnv);
-+                false, repository, Reference<task::XAbortChannel>(), xCmdEnv);
-         }
-         else if ( subCommand == "list" )
-         {
-diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
-index b68ab20..2912e45 100644
---- a/offapi/com/sun/star/deployment/XExtensionManager.idl
-+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
-@@ -260,6 +260,9 @@ interface XExtensionManager
-         <p>
-         Please use this in case of suspected cache inconsistencies only.
-         </p>
-+        @param force
-+               set to true when called during soffice bootstrap after cleaning
-+               old extension cache
-         @param repositroy
-                the name of the repository
-         @param xAbortChannel
-@@ -268,6 +271,7 @@ interface XExtensionManager
-                command environment for error and progress handling
-     */
-     void reinstallDeployedExtensions(
-+        [in] boolean force,
-         [in] string repository,
-         [in] com::sun::star::task::XAbortChannel xAbortChannel,
-         [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
-diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
-index 12e7e0e..39ff04a 100644
---- a/offapi/com/sun/star/deployment/XPackageManager.idl
-+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
-@@ -225,12 +225,16 @@ interface XPackageManager
-         Please use this in case of suspected cache inconsistencies only.
-         </p>
- 
-+        @param force
-+               set to true when called during soffice bootstrap after cleaning
-+               old extension cache
-         @param xAbortChannel
-                abort channel to asynchronously abort the adding process
-         @param xCmdEnv
-                command environment for error and progress handling
-     */
-     void reinstallDeployedPackages(
-+        [in] boolean force,
-         [in] com::sun::star::task::XAbortChannel xAbortChannel,
-         [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
-         raises (DeploymentException,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/libreoffice/libreoffice-base.install b/testing/libreoffice/libreoffice-base.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-base.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/libreoffice-calc.install b/testing/libreoffice/libreoffice-calc.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-calc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/libreoffice-common.csh b/testing/libreoffice/libreoffice-common.csh
deleted file mode 100644
index 5efa39404..000000000
--- a/testing/libreoffice/libreoffice-common.csh
+++ /dev/null
@@ -1,8 +0,0 @@
-#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
-
-# to force a certain look'n feel
-
-#setenv SAL_USE_VCLPLUGIN gen
-#setenv SAL_USE_VCLPLUGIN kde4
-#setenv SAL_USE_VCLPLUGIN gtk
-#setenv SAL_USE_VCLPLUGIN gtk3
diff --git a/testing/libreoffice/libreoffice-common.install b/testing/libreoffice/libreoffice-common.install
deleted file mode 100644
index e66b66f3d..000000000
--- a/testing/libreoffice/libreoffice-common.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-
-echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
-echo "-------------------------------------------------------------------"
-echo "LibreOffice has been split into several packages:"
-echo "- libreoffice-common"
-echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
-echo "-------------------------------------------------------------------"
-echo " * you need to install at least one libreoffice-langpack"
-echo " * you may want to pacman -Ss libreoffice-extensions"
-echo "   to see what additional extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
-         for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-#  post_install $1
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "LibreOffice has been split into several packages:"
-    echo "- libreoffice-common"
-    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
-    echo "Now you need to install at least one libreoffice-langpack!"
-  fi
-}
-
-post_remove() {
-update-desktop-database -q
-xdg-icon-resource forceupdate --theme hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/testing/libreoffice/libreoffice-common.sh b/testing/libreoffice/libreoffice-common.sh
deleted file mode 100644
index 795867125..000000000
--- a/testing/libreoffice/libreoffice-common.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
-
-# to force a certain look'n feel
-
-#export SAL_USE_VCLPLUGIN=gen
-#export SAL_USE_VCLPLUGIN=kde4
-#export SAL_USE_VCLPLUGIN=gtk
-#export SAL_USE_VCLPLUGIN=gtk3
diff --git a/testing/libreoffice/libreoffice-draw.install b/testing/libreoffice/libreoffice-draw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-draw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/libreoffice-impress.install b/testing/libreoffice/libreoffice-impress.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-impress.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/libreoffice-writer.install b/testing/libreoffice/libreoffice-writer.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-writer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
deleted file mode 100644
index e86548136..000000000
--- a/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index defd7b2..ea2a809 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index f93ac5e..92a2891 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
- #
- #*************************************************************************
-+import os
- import sys
- 
-+sys.path.append('/usr/lib/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc"
- import pyuno
- 
- try:
-diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
-index 610ac5f..df243d0 100755
---- a/scripting/source/pyprov/officehelper.py
-+++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
-         if "UNO_PATH" in os.environ:
-             sOffice = os.environ["UNO_PATH"]
-         else:
--            sOffice = "" # lets hope for the best
-+            sOffice = "/usr/lib/libreoffice/program"
-         sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"): 
-             sOffice += ".exe"
diff --git a/testing/librsvg/PKGBUILD b/testing/librsvg/PKGBUILD
deleted file mode 100644
index 5389ec8a3..000000000
--- a/testing/librsvg/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169175 2012-10-18 19:23:45Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=librsvg
-pkgver=2.36.4
-pkgrel=1
-pkgdesc="A SVG viewing library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection')
-optdepends=('gtk3: for rsvg-view-3'
-            'gtk2: gtk2 SVG engine module')
-options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
-install=librsvg.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/librsvg/librsvg.install b/testing/librsvg/librsvg.install
deleted file mode 100644
index 8852ebf28..000000000
--- a/testing/librsvg/librsvg.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/libsecret/PKGBUILD b/testing/libsecret/PKGBUILD
deleted file mode 100644
index 1ec9f5695..000000000
--- a/testing/libsecret/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libsecret
-pkgver=0.10
-pkgrel=1
-pkgdesc='library for storing and retrieving passwords and other secrets.'
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="https://live.gnome.org/Libsecret"
-depends=('glib2' 'libgcrypt')
-makedepends=('intltool' 'docbook-xsl')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD
deleted file mode 100644
index 084b15b16..000000000
--- a/testing/libsoup/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 169173 2012-10-18 19:23:38Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.40.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('77a55d57e7e8055acd2f44e0cc889b9ba48052e8b7f07e829157d57417ac650a')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/env python/python2/' libsoup/tld-parser.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "$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' 'sqlite')
-
-  cd "$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/libtool/PKGBUILD b/testing/libtool/PKGBUILD
deleted file mode 100644
index 99f3d8ee4..000000000
--- a/testing/libtool/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168294 2012-10-08 01:42:04Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuilt with each new gcc version
-
-pkgname=('libtool' 'libltdl')
-pkgver=2.4.2
-pkgrel=7
-pkgdesc="A generic library support script"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make check
-}
-
-package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.2')
-  groups=('base-devel')
-  install=libtool.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
-                         install-ltdlincludeHEADERS install-data-local
-  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
-}
diff --git a/testing/libtool/libtool.install b/testing/libtool/libtool.install
deleted file mode 100644
index 73cf56422..000000000
--- a/testing/libtool/libtool.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-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/libtorrent-rasterbar/PKGBUILD b/testing/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index 1144770d1..000000000
--- a/testing/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163550 2012-07-15 13:17:05Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.16.1
-pkgrel=1
-epoch=1
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'geoip' 'python2')
-makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('798944301ee6ef8e0d8de3d944c59d184ef1a4d3')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \
-      --enable-python-binding \
-      --with-libgeoip=system
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/libusb-compat/PKGBUILD b/testing/libusb-compat/PKGBUILD
deleted file mode 100644
index 3e4235ff4..000000000
--- a/testing/libusb-compat/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 162897 2012-07-03 09:52:18Z tpowa $
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: arjan <arjan@archlinux.org>
-
-pkgname=libusb-compat
-pkgver=0.1.4
-pkgrel=2
-pkgdesc="Library to enable user space application programs to communicate with USB devices"
-arch=('i686' 'x86_64')
-url="http://libusb.sourceforge.net/"
-license=('LGPL')
-depends=('libusb' 'sh')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2"
-        "libusb-0.1-libusbx.patch")   
-md5sums=('2ca521fffadd0c28fdf174e6ec73865b'
-         '1612c3982f307da1332d6db57b16742b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # http://libusb.org/ticket/138 can be removed with libusbx 1.0.13
-  patch -Np0 -i ../libusb-0.1-libusbx.patch
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/libusb-compat/libusb-0.1-libusbx.patch b/testing/libusb-compat/libusb-0.1-libusbx.patch
deleted file mode 100644
index 61563651b..000000000
--- a/testing/libusb-compat/libusb-0.1-libusbx.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/423135
-
---- libusb/core.c
-+++ libusb/core.c
-@@ -32,12 +32,6 @@
- static libusb_context *ctx = NULL;
- static int usb_debug = 0;
- 
--enum usbi_log_level {
--	LOG_LEVEL_DEBUG,
--	LOG_LEVEL_INFO,
--	LOG_LEVEL_WARNING,
--	LOG_LEVEL_ERROR,
--};
- 
- #ifdef ENABLE_LOGGING
- #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt)
diff --git a/testing/libusbx/PKGBUILD b/testing/libusbx/PKGBUILD
deleted file mode 100644
index dd36b151c..000000000
--- a/testing/libusbx/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167303 2012-09-30 19:31:57Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=libusbx
-pkgver=1.0.14
-pkgrel=1
-depends=('glibc')
-pkgdesc="Library that provides generic access to USB device"
-arch=(i686 x86_64)
-url="http://libusbx.org"
-license=('LGPL')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-options=(!libtool)
-replaces=('libusb1' 'libusb')
-provides=("libusb=$pkgver")
-conflicts=("libusb")
-md5sums=('0a6a75edb4b4eae7dc82c1dd71ddc470')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libva-driver-intel/PKGBUILD b/testing/libva-driver-intel/PKGBUILD
deleted file mode 100644
index f679e0615..000000000
--- a/testing/libva-driver-intel/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 160980 2012-06-07 20:14:28Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libva-driver-intel
-pkgver=1.0.18
-pkgrel=1
-pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
-arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
-license=('MIT')
-depends=('libva')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
-md5sums=('d8c52f07148dfb2e0407549b90300bc1')
-
-build() {
-  cd intel-driver-$pkgver
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd intel-driver-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libva/PKGBUILD b/testing/libva/PKGBUILD
deleted file mode 100644
index 0e9740e73..000000000
--- a/testing/libva/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 160974 2012-06-07 19:25:27Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libva
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Video Acceleration (VA) API for Linux"
-arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
-license=('MIT')
-depends=('libegl' 'libgl' 'libdrm' 'libxfixes')
-makedepends=('mesa')
-optdepends=('vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards')
-options=('!libtool')
-install=libva.install
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b22179bd44137e91d5c77a43a0cb8063')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libva/libva.install b/testing/libva/libva.install
deleted file mode 100644
index 4d8b8e24a..000000000
--- a/testing/libva/libva.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() { 
-    if  [ "$(vercmp $2 1.0.15-1)" -lt 0 ]; then
-        echo 'Starting with libva version 1.0.15, the intel back-end is now in libva-driver-intel.'
-    fi
-}
diff --git a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch
deleted file mode 100644
index 1d7f99e56..000000000
--- a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c
---- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c	2006-02-06 05:47:26.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c	2007-07-04 18:12:58.000000000 +1000
-@@ -282,7 +282,7 @@
- 
- void render_deformation(JessPrivate *priv, int defmode)
- {
--	uint32_t bmax;
-+	intptr_t bmax;
- 	uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i;
- 	uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux;
- 
-@@ -294,7 +294,7 @@
- 		tab2 = priv->table2;
- 		tab3 = priv->table3;
- 		tab4 = priv->table4;
--		bmax = priv->resx * priv->resy + (uint32_t) priv->pixel;
-+		bmax = priv->resx * priv->resy + (intptr_t) priv->pixel;
- 
- 		switch(defmode)
- 		{
-@@ -352,7 +352,7 @@
- 		}
- 		for (i = 0; i < priv->resy * priv->resx; i++)
- 		{
--			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer);
-+			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer);
- 			*(pix++) = *(aux++) ;
- 			*(pix++) = *(aux++);  
- 			*(pix++) = *(aux);  
-@@ -373,7 +373,8 @@
- 	/* j'ai mis pixel par defaut... */
- 
- 	uint8_t *pix = priv->pixel;
--	uint32_t bmax,pitch_4;
-+	intptr_t bmax;
-+	uint32_t pitch_4;
- 	
- 	pix = priv->pixel;
- 	if (priv->pixel == NULL)
-@@ -387,7 +388,7 @@
- 	if (priv->video == 8)
- 	{
- 		if (visual_cpu_get_mmx ()) {
--			bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel;
-+			bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel;
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
- 			__asm __volatile
- 				("\n\t pxor %%mm6, %%mm6"
-@@ -423,7 +424,7 @@
- 	else
- 	{
- 		pitch_4 = priv->pitch+4;
--		bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel;
-+		bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel;
- 
- 		if (visual_cpu_get_mmx ()) {
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
diff --git a/testing/libvisual-plugins/03_build_against_gl_fixes.patch b/testing/libvisual-plugins/03_build_against_gl_fixes.patch
deleted file mode 100644
index b21558232..000000000
--- a/testing/libvisual-plugins/03_build_against_gl_fixes.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_bumpscope.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_bumpscope_la_LDFLAGS = -module -avoid-version 
-+actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_bumpscope_la_SOURCES = actor_bumpscope.c \
- 			  actor_bumpscope.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_corona.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir)
- 
- actor_corona_la_LDFLAGS = -module -avoid-version
-+actor_corona_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_corona_la_SOURCES = actor_corona.cpp \
- 			  autopal.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am	2006-02-24 00:34:48.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la
- 
--LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version 
-+actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS)
- 
- actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am	2006-02-23 20:03:27.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,14 +2,13 @@
- 
- actor_plugin_LTLIBRARIES = actor_gstreamer.la
- 
--LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS)
- 
- INCLUDES = $(all_includes) \
- 	-I$(top_srcdir) 
- 
- actor_gstreamer_la_LDFLAGS = -module -avoid-version 
-+actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
- 
- actor_gstreamer_la_SOURCES = actor_gstreamer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am	2006-02-23 20:03:27.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_infinite.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_infinite_la_LDFLAGS = -module -avoid-version 
-+actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_infinite_la_SOURCES = compute.c compute.h \
- 			    display.c display.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am	2006-02-23 20:03:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_jakdaw.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_jakdaw_la_LDFLAGS = -module -avoid-version 
-+actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_jakdaw_la_SOURCES = actor_jakdaw.c \
- 			  actor_jakdaw.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_JESS.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_JESS_la_LDFLAGS = -module -avoid-version
-+actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\
- 			distorsion.c distorsion.h\
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am	2006-02-23 20:03:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,14 +2,13 @@
- 
- actor_plugin_LTLIBRARIES = actor_lv_analyzer.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) \
- 	-I$(top_srcdir) 
- 
- actor_lv_analyzer_la_LDFLAGS = -module -avoid-version 
-+actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am	2006-02-24 22:24:49.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,5 +4,5 @@
- 
- actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
- actor_lv_gltest_la_LDFLAGS = -module -avoid-version 
--actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
-+actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
- actor_lv_gltest_la_SOURCES = actor_lv_gltest.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am	2006-02-23 20:03:29.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_lv_scope.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_lv_scope_la_LDFLAGS = -module -avoid-version 
-+actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_lv_scope_la_SOURCES = actor_lv_scope.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am	2006-02-24 22:24:49.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -10,5 +10,5 @@
- 
- actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\"
- actor_madspin_la_LDFLAGS = -module -avoid-version 
--actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
-+actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
- actor_madspin_la_SOURCES = madspin.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am	2006-02-24 22:24:50.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,5 +4,5 @@
- 
- actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
- actor_nastyfft_la_LDFLAGS = -module -avoid-version 
--actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
-+actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
- actor_nastyfft_la_SOURCES = actor_nastyfft.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am	2006-02-23 20:03:31.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_oinksie.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_oinksie_la_LDFLAGS = -module -avoid-version 
-+actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_oinksie_la_SOURCES = actor_oinksie.c\
- 			   oinksie.c oinksie.h\
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am	2006-03-09 00:06:58.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,7 +4,7 @@
- 
- actor_flower_la_LDFLAGS = -module -avoid-version 
- actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
--actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
-+actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
- 
- actor_flower_la_SOURCES = \
- 	actor_flower.c \
-diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am	2006-02-23 20:03:35.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,12 +2,11 @@
- 
- input_plugin_LTLIBRARIES = input_alsa.la
- 
--LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
- 
- input_alsa_la_LDFLAGS = -module -avoid-version 
-+input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS)
- 
- input_alsa_la_SOURCES = input_alsa.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am	2006-02-23 20:03:36.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- input_plugin_LTLIBRARIES = input_debug.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
- 
- input_debug_la_LDFLAGS = -module -avoid-version 
-+input_debug_la_LIBADD = $(LIBVISUAL_LIBS)
- input_debug_la_SOURCES = input_debug.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am	2006-02-23 20:03:37.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- input_plugin_LTLIBRARIES = input_esd.la
- 
--LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir)
- 
- input_esd_la_LDFLAGS = -module -avoid-version 
-+input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
- input_esd_la_SOURCES = input_esd.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am	2006-02-23 20:03:37.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- input_plugin_LTLIBRARIES = input_jack.la
- 
--LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- input_jack_la_LDFLAGS = -module -avoid-version 
-+input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
- 
- input_jack_la_SOURCES = input_jack.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am	2006-02-23 20:03:38.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,12 +2,11 @@
- 
- input_plugin_LTLIBRARIES = input_mplayer.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- input_mplayer_la_LDFLAGS = -module -avoid-version 
-+input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS)
- input_mplayer_la_SOURCES = input_mplayer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am	2006-02-23 20:03:38.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_alphablend.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_alphablend_la_LDFLAGS = -module -avoid-version 
-+morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_alphablend_la_SOURCES = morph_alphablend.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_flash.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_flash_la_LDFLAGS = -module -avoid-version 
-+morph_flash_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_flash_la_SOURCES = morph_flash.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_slide.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_slide_la_LDFLAGS = -module -avoid-version 
-+morph_slide_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_slide_la_SOURCES = morph_slide.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_tentacle.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_tentacle_la_LDFLAGS = -module -avoid-version 
-+morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_tentacle_la_SOURCES = morph_tentacle.c
diff --git a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch b/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch
deleted file mode 100644
index 1fc5f7fc7..000000000
--- a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac
---- libvisual-plugins-0.4.0/configure.ac	2006-03-17 03:50:41.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/configure.ac	2007-07-04 18:22:38.000000000 +1000
-@@ -361,7 +361,7 @@
-   [ENABLE_ANALYZER=$enableval],
-   [ENABLE_ANALYZER=yes])
- 
--if test "$ENABLE_ANALYZER" = xyes; then
-+if test "$ENABLE_ANALYZER" = "yes"; then
-   build_actor_plugins="$build_actor_plugins lv_analyzer"
- fi
- 
diff --git a/testing/libvisual-plugins/050_all_automagic.patch b/testing/libvisual-plugins/050_all_automagic.patch
deleted file mode 100644
index 9c25fac72..000000000
--- a/testing/libvisual-plugins/050_all_automagic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.ac.old	2007-02-24 23:09:08.000000000 +0100
-+++ configure.ac	2007-02-24 23:13:15.000000000 +0100
-@@ -89,7 +89,18 @@
- 
- dnl Libraries
- 
-+dnl List of plugins to build
-+build_input_plugins=""
-+build_actor_plugins=""
-+build_morph_plugins=""
-+
- dnl EsounD
-+AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd],
-+	[Do not build esound input plugin @<:@default=enabled@:>@]),
-+	[ENABLE_INPUT_ESD=$enableval],
-+	[ENABLE_INPUT_ESD=yes])
-+
-+if test "$ENABLE_INPUT_ESD" = "yes"; then
- PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version],
-   [HAVE_ESD="yes"], [HAVE_ESD="no"])
- 
-@@ -98,8 +109,15 @@
- else
-   AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built])
- fi
-+fi
- 
- dnl JACK
-+AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack],
-+	[Do not build jack input plugin @<:@default=enabled@:>@]),
-+        [ENABLE_INPUT_JACK=$enableval],
-+	[ENABLE_INPUT_JACK=yes])
-+
-+if test "$ENABLE_INPUT_JACK" = "yes"; then
- PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"])
- if test "$HAVE_JACK" = "yes"; then
-   build_input_plugins="$build_input_plugins jack"
-@@ -107,11 +125,7 @@
-   AC_MSG_WARN([*** libjack is too old. You can download a newer version at
-              http://jackit.sf.net/. The jackit input plugin won't be built])
- fi
--
--dnl List of plugins to build
--build_input_plugins=""
--build_actor_plugins=""
--build_morph_plugins=""
-+fi
- 
- dnl GdkPixbuf
- AC_ARG_ENABLE([gdkpixbuf-plugin],
diff --git a/testing/libvisual-plugins/05_fix_po.patch b/testing/libvisual-plugins/05_fix_po.patch
deleted file mode 100644
index a5413ef1b..000000000
--- a/testing/libvisual-plugins/05_fix_po.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in
---- libvisual-plugins-0.4.0/po/Makefile.in.in	2006-03-21 05:48:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/po/Makefile.in.in	2007-07-09 21:50:13.000000000 +1000
-@@ -28,7 +28,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = mkinstalldirs
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
-diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs
---- libvisual-plugins-0.4.0/po/mkinstalldirs	1970-01-01 10:00:00.000000000 +1000
-+++ libvisual-plugins-0.4.0.new/po/mkinstalldirs	2006-03-21 05:48:42.000000000 +1100
-@@ -0,0 +1,111 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain
-+
-+errstatus=0
-+dirmode=""
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage" 1>&2
-+      exit 0
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
-+
-+for file
-+do
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+case $dirmode in
-+  '')
-+    if mkdir -p -- . 2>/dev/null; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    fi
-+    ;;
-+esac
-+
-+for file
-+do
-+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+  shift
-+
-+  pathcomp=
-+  for d
-+  do
-+    pathcomp="$pathcomp$d"
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+  	errstatus=$lasterr
-+      else
-+  	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+    	  lasterr=""
-+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+  	  if test ! -z "$lasterr"; then
-+  	    errstatus=$lasterr
-+  	  fi
-+  	fi
-+      fi
-+    fi
-+
-+    pathcomp="$pathcomp/"
-+  done
-+done
-+
-+exit $errstatus
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# End:
-+# mkinstalldirs ends here
diff --git a/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch b/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch
deleted file mode 100644
index 8e54e02cb..000000000
--- a/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The static VisPluginInfo in nastyfft was declared as const, but libvisual write
-to its refcount when it visual_object_unref()s it (nasty!).  This is broken at
-various levels: libvisual shouldn't be writing to this static plugin which is
-allocated by a dlopen()ed plugin, and it should also honor the "const
-VisPluginInfo" API...  Anyway, nastyfft was the only occurrence and this fixes
-the crash for now; LP: #287448.
-
---- libvisual-plugins-0.4.0.dfsg.1.orig/plugins/actor/nastyfft/actor_nastyfft.c
-+++ libvisual-plugins-0.4.0.dfsg.1/plugins/actor/nastyfft/actor_nastyfft.c
-@@ -80,7 +80,7 @@
- 		.vidoptions.depth = VISUAL_VIDEO_DEPTH_GL
- 	}};
- 
--	static const VisPluginInfo info[] = {{
-+	static VisPluginInfo info[] = {{
- 		.type = VISUAL_PLUGIN_TYPE_ACTOR,
- 
- 		.plugname = N_("nastyfft"),
diff --git a/testing/libvisual-plugins/PKGBUILD b/testing/libvisual-plugins/PKGBUILD
deleted file mode 100644
index df8684ed6..000000000
--- a/testing/libvisual-plugins/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 168488 2012-10-12 17:38:33Z andyrtr $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=libvisual-plugins
-pkgver=0.4.0
-pkgrel=7
-pkgdesc="plugins for libvisual"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://www.localhost.nl/~synap/libvisual/"
-depends=('libvisual' 'gtk2' 'glu' 'alsa-lib' 'jack')
-makedepends=('mesa')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz
-        02_64-bit_JESS_fix.patch
-        03_build_against_gl_fixes.patch
-        04_lv_analyzer_build_fix.patch
-        05_fix_po.patch
-        050_all_automagic.patch
-        60_no-const-vispluginfo-in-nastyfft.patch)
-md5sums=('4330e9287f9d6fae02f482f428a1e77b'
-         'f9cfb607bfcbfef60830fae4e7dc6963'
-         '116701408747dbb87dc134434478ebe2'
-         '01678a8f1584c76a44e59d81003a1109'
-         '6189b7427c4e11c8b8d6c6266d6a1629'
-         'b50ae94c424a5f0af235deffa8451eb6'
-         '7012518727cb072a7e90a826a5577cc6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch"
-  patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch"
-  patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch"
-  patch -Np0 -i "${srcdir}/050_all_automagic.patch"
-  patch -Np1 -i "${srcdir}/60_no-const-vispluginfo-in-nastyfft.patch"
-
-  autoreconf -fi
-  # Apply later as autoreconf overwrites po/Makefile.in.in
-  patch -Np1 -i "${srcdir}/05_fix_po.patch"
-
-  ./configure --prefix=/usr \
-      --disable-gstreamer-plugin \
-      --disable-gforce \
-      --disable-esd
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libwacom/PKGBUILD b/testing/libwacom/PKGBUILD
deleted file mode 100644
index 5080168da..000000000
--- a/testing/libwacom/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164040 2012-07-24 23:12:01Z eric $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libwacom
-pkgver=0.6
-pkgrel=1
-pkgdesc="Library to identify Wacom tablets and their features"
-arch=('x86_64' 'i686')
-url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
-license=('MIT')
-depends=('glib2' 'systemd-tools')
-options=('!libtool')
-source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/libwps/PKGBUILD b/testing/libwps/PKGBUILD
deleted file mode 100644
index 1d7c87e6c..000000000
--- a/testing/libwps/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 165826 2012-08-31 04:51:19Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Robert McCathie <archaur at rmcc dot com dot au>
-
-pkgname=libwps
-pkgver=0.2.7
-pkgrel=1
-pkgdesc="a Microsoft Works file word processor format import filter library"
-arch=('i686' 'x86_64')
-url="http://libwps.sourceforge.net/"
-license=('LGPL')
-depends=('libwpd>=0.9.4')
-makedepends=('boost')
-options=(!libtool)
-source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2")
-md5sums=('d197bd6211669a2fa4ca648faf04bcb1')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure  --prefix=/usr \
-	  --disable-static \
-	  --disable-werror
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
-
diff --git a/testing/libxcb/PKGBUILD b/testing/libxcb/PKGBUILD
deleted file mode 100644
index 60833c061..000000000
--- a/testing/libxcb/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 168201 2012-10-06 20:05:33Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxcb
-pkgver=1.9
-pkgrel=1
-pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'python2')
-options=('!libtool')
-license=('custom')
-source=($url/dist/$pkgname-$pkgver.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 
-  ./autogen.sh --prefix=/usr \
-    --enable-xinput \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index 8e8162f0a..000000000
--- a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/testing/libxklavier/PKGBUILD b/testing/libxklavier/PKGBUILD
deleted file mode 100644
index 1c8023bd1..000000000
--- a/testing/libxklavier/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169172 2012-10-18 19:23:34Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-
-pkgname=libxklavier
-pkgver=5.3
-pkgrel=1
-pkgdesc="High-level API for X Keyboard Extension"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes')
-makedepends=('gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://gswitchit.sourceforge.net"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libxml2/PKGBUILD b/testing/libxml2/PKGBUILD
deleted file mode 100644
index 38700a682..000000000
--- a/testing/libxml2/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165055 2012-08-09 21:18:17Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=libxml2
-pkgver=2.8.0
-pkgrel=1
-pkgdesc="XML parsing library, version 2"
-arch=(i686 x86_64)
-license=('custom')
-depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7' 'xz')
-makedepends=('python2')
-options=('!libtool')
-url="http://www.xmlsoft.org/"
-source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        http://www.w3.org/XML/Test/xmlts20080205.tar.gz)
-md5sums=('c62106f02ee00b6437f0fb9d370c1093'
-         'b255be9a1c7f7021e52448e4ec8d7a0d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
-  ./configure --prefix=/usr --with-threads --with-history \
-     --with-python=/usr/bin/python2
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  mv "${srcdir}/xmlconf" .
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/testing/libxrandr/PKGBUILD b/testing/libxrandr/PKGBUILD
deleted file mode 100644
index ccddaba57..000000000
--- a/testing/libxrandr/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164269 2012-07-29 11:06:35Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxrandr
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="X11 RandR extension library"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxext' 'libxrender' 'randrproto>=1.4.0')
-makedepends=('xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
-sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3')
-
-build() {
-  cd "${srcdir}/libXrandr-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/libXrandr-${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/libzapojit/PKGBUILD b/testing/libzapojit/PKGBUILD
deleted file mode 100644
index d3c5c1690..000000000
--- a/testing/libzapojit/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169171 2012-10-18 19:23:32Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libzapojit
-pkgver=0.0.2
-pkgrel=1
-pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup' 'gnome-online-accounts')
-makedepends=('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=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libzeitgeist/PKGBUILD b/testing/libzeitgeist/PKGBUILD
deleted file mode 100644
index 65137cd82..000000000
--- a/testing/libzeitgeist/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: kiefer <jorgelmadrid@gmail.com>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=libzeitgeist
-pkgver=0.3.18
-_pkgmainver=0.3
-pkgrel=3
-pkgdesc="Zeitgeist client library"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/libzeitgeist"
-license=('LGPL2.1')
-depends=('glib2')
-optdepends=("zeitgeist: zeitgeist framework")
-options=('!libtool')
-source=(http://launchpad.net/${pkgname}/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d63a37295d01a58086d0d4ae26e604c2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/licq/PKGBUILD b/testing/licq/PKGBUILD
deleted file mode 100644
index 702dbfbcc..000000000
--- a/testing/licq/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 163551 2012-07-15 13:17:08Z ibiru $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=licq
-pkgver=1.6.0
-pkgrel=5
-pkgdesc="Advanced graphical ICQ clone and more for Unix" 
-arch=('i686' 'x86_64')
-url="http://www.licq.org"
-license=('GPL')
-depends=('boost-libs' 'gpgme' 'libxss' 'qt')
-makedepends=('cmake' 'boost')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('383153697e281a0b1b4ff008936731b8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # licq
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
-  make
-
-  # qt4-gui
-  cd ../plugins/qt4-gui
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd ../plugins/qt4-gui/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD
deleted file mode 100644
index 75b79952a..000000000
--- a/testing/links/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 162375 2012-06-26 06:36:44Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=links
-pkgver=2.7
-pkgrel=1
-pkgdesc="A text WWW browser, similar to Lynx"
-arch=('i686' 'x86_64')
-url="http://links.twibright.com/"
-license=('GPL')
-depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm')
-makedepends=('libtiff' 'libpng' 'libxt')
-optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
-provides=('links-g')
-conflicts=('links-g')
-replaces=('links-g')
-source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
-sha1sums=('1e362a7e27078d630edf5868145a46247cda8cc3'
-          'f600e27c2a71184444f7dd07a10230aa44463a02')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  (cd intl; ./gen-intl; ./synclang)
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --enable-graphics --with-x --with-fb
-  make
-  mv links xlinks
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --disable-graphics --without-x  --without-fb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
-  ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
-
-  install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop"
-  install -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/"
-
-  install -d "${pkgdir}/usr/share/doc/links/calibration"
-  install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
-}
diff --git a/testing/links/links.desktop b/testing/links/links.desktop
deleted file mode 100644
index 9d6338a5b..000000000
--- a/testing/links/links.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Links
-Exec=xlinks -g
-Icon=links_32x32.xpm
-Type=Application
-Terminal=false
-Categories=Network;WebBrowser;
diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
deleted file mode 100644
index f2d221443..000000000
--- a/testing/lirc/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 159373 2012-05-22 19:35:40Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=18
-epoch=1
-_extramodules=extramodules-3.4-ARCH
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-headers>=3.4' 'linux-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
-        lirc_wpc8769l.patch
-        lircd-handle-large-config.patch
-        lirc_atiusb-kfifo.patch
-        kernel-2.6.39.patch
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
-         '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb')
-
-build() {
-  _kernver="$(cat /lib/modules/${_extramodules}/version)"
-  cd "${srcdir}/lirc-${pkgver}"
-  patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
-  patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
-  patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
-  patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
-
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  sed -e 's/@X_CFLAGS@//g' \
-      -e 's/@X_LIBS@//g' \
-      -e 's/@X_PRE_LIBS@//g' \
-      -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-  libtoolize
-  autoreconf
-
-  PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
-      --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-      --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
-      --with-transmitter
-
-  # Remove drivers already in kernel
-  sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-      -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
-      -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
-      -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile 
-  make
-}
-
-package_lirc() {
-  pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.4' 'linux<3.5')
-  replaces=('lirc+pctv')
-  install=lirc.install
-
-  cd "${srcdir}/lirc-${pkgver}/drivers"
-  make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
-
-  # set the kernel we've built for inside the install script
-  sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
-  # gzip -9 modules
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
-
-package_lirc-utils() {
-  pkgdesc="Linux Infrared Remote Control utils"
-  depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
-  optdepends=('python2: pronto2lirc utility')
-  options=('strip' '!libtool')
-  backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
-
-  cd "${srcdir}/lirc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
-  cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
-  cp -rp remotes "${pkgdir}/usr/share/lirc"
-  chmod -R go-w "${pkgdir}/usr/share/lirc/"
-
-  # install the logrotate config
-  install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
-    
-  # install conf.d file
-  install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
-  # install conf.d file
-  install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
-  install -d "${pkgdir}/etc/lirc"
-  
-  # remove built modules
-  rm -r "${pkgdir}/lib/"
-}
diff --git a/testing/lirc/irexec.conf b/testing/lirc/irexec.conf
deleted file mode 100644
index f911c7515..000000000
--- a/testing/lirc/irexec.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters for irexec daemon (path to lircrc)
-#
-
-IREXEC_OPTS=""
\ No newline at end of file
diff --git a/testing/lirc/irexecd b/testing/lirc/irexecd
deleted file mode 100755
index a64b033a5..000000000
--- a/testing/lirc/irexecd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/irexec.conf
-
-PID=`pidof -o %PPID /usr/bin/irexec`
-case "$1" in
-  start)
-    stat_busy "Starting IREXEC Daemon"
-    [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon irexecd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IREXEC Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irexecd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/testing/lirc/kernel-2.6.39.patch b/testing/lirc/kernel-2.6.39.patch
deleted file mode 100644
index 7353d61ca..000000000
--- a/testing/lirc/kernel-2.6.39.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
---- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c	2011-06-07 17:02:20.356580306 +0200
-@@ -48,7 +48,6 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
--#include <linux/smp_lock.h>
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
---- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c	2011-06-07 17:04:19.725933627 +0200
-@@ -555,8 +555,8 @@
- 		kfree(ir);
- 		return -EINVAL;
- 	}
--	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
--	       adap->id, addr, ir->c.name);
-+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+	       addr, ir->c.name);
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	/* register device */
-diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-06-07 17:07:23.984935411 +0200
-@@ -361,14 +361,14 @@
- 		size = count << 3;
- 
- 		ldata = (unsigned long *) data_buf;
--		next_one = generic_find_next_le_bit(ldata, size, 0);
-+		next_one = find_next_zero_bit_le(ldata, size, 0);
- 
- 		if (next_one > 0)
- 			put_pulse_bit(next_one
- 				* WPC8769L_USECS_PER_BIT);
- 
- 		while (next_one < size) {
--			next_zero = generic_find_next_zero_le_bit(ldata,
-+			next_zero = find_next_zero_bit_le(ldata,
- 				size, next_one + 1);
- 
- 			put_space_bit(
-@@ -376,7 +376,7 @@
- 				* WPC8769L_USECS_PER_BIT);
- 
- 			if (next_zero < size) {
--				next_one = generic_find_next_le_bit(ldata,
-+				next_one = find_next_bit_le(ldata,
- 					size, next_zero + 1);
- 
- 				put_pulse_bit(
diff --git a/testing/lirc/lirc.install b/testing/lirc/lirc.install
deleted file mode 100644
index 4551e88dc..000000000
--- a/testing/lirc/lirc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRAMODULES=extramodules-3.4-ARCH
-
-post_install() {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install
-}
-
-# arg 1:  the old package version
-post_remove() {
-  post_install
-}
diff --git a/testing/lirc/lirc.logrotate b/testing/lirc/lirc.logrotate
deleted file mode 100644
index 623c4f328..000000000
--- a/testing/lirc/lirc.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/lircd {
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/testing/lirc/lirc_atiusb-kfifo.patch b/testing/lirc/lirc_atiusb-kfifo.patch
deleted file mode 100644
index a64984dce..000000000
--- a/testing/lirc/lirc_atiusb-kfifo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
-From: Jason Martin <publicmsu@gmail.com>
-Date: Fri, 3 Jun 2011 00:12:51 -0400
-Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
-
-I came across posts with regards to lirc_atiusb and its compatibility
-with newer kernels, and their use of kfifo.I spent a little bit of time
-this evening, and was able to correct the issues with the driver, and
-now have a functioning lirc_atiusb device under the 2.6.38 kernel.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_atiusb/lirc_atiusb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
-index 52080de..bf2b631 100644
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
- 		goto new_irctl_failure_check;
- 	}
- 
--	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
--- 
-1.7.0.1
-
diff --git a/testing/lirc/lirc_wpc8769l.patch b/testing/lirc/lirc_wpc8769l.patch
deleted file mode 100644
index e4e2a049b..000000000
--- a/testing/lirc/lirc_wpc8769l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
-Date: Wed, 30 Mar 2011 16:46:35 -0400
-Subject: [PATCH] Make lirc_wpc8769l functional again
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_wpc8769l/lirc_wpc8769l.c |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index f820d11..4d04063 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
- 	/* Reset last timeout value. */
- 	lastus = 0;
- 
--	/* Init the read buffer. */
--	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
--		return -ENOMEM;
--
- 	/* Acquire the IRQ. */
- 	result = request_irq(irq, irq_handler,
- 			   IRQF_DISABLED | IRQF_SHARED,
-@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
- 	/* Free the IRQ. */
- 	free_irq(irq, THIS_MODULE);
- 	dprintk("Freed IRQ %d\n", irq);
--
--	/* Free the RX buffer. */
--	lirc_buffer_free(&rbuf);
- }
- 
- static struct lirc_driver driver = {
-@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
- 	/* Do load-time checks. */
- 	wpc8769l_power_up_and_check_if_we_woke_us_up();
- 
-+	/* Init the read buffer. */
-+	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
-+		rc = -ENOMEM;
-+		goto exit_platform_exit;
-+	}
-+
- 	/* Configure the driver hooks. */
- 	driver.features = LIRC_CAN_REC_MODE2;
-+	driver.dev = &lirc_wpc8769l_platform_dev->dev;
- 	driver.minor = lirc_register_driver(&driver);
- 	if (driver.minor < 0) {
- 		eprintk("lirc_register_driver failed!\n");
- 		rc = -EIO;
--		goto exit_platform_exit;
-+		goto exit_release_buffer;
- 	}
- 
- 	iprintk("Driver loaded.\n");
- 
- 	return 0; /* Everything OK. */
- 
-+exit_release_buffer:
-+	lirc_buffer_free(&rbuf);
-+
- exit_platform_exit:
- 	lirc_wpc8769l_platform_exit();
- 
-@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
- 
- static void __exit lirc_wpc8769l_module_exit(void)
- {
--	/* Unregister the platform driver and device. */
--	lirc_wpc8769l_platform_exit();
--
- 	/* Unregister the LIRC driver. */
- 	lirc_unregister_driver(driver.minor);
- 
-+	/* Free the buffer. */
-+	lirc_buffer_free(&rbuf);
-+
-+	/* Unregister the platform driver and device. */
-+	lirc_wpc8769l_platform_exit();
-+
- 	/* Release the second range. */
- 	if (baseport2)
- 		release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
--- 
-1.7.0.1
-
diff --git a/testing/lirc/lircd b/testing/lirc/lircd
deleted file mode 100755
index e9739b36e..000000000
--- a/testing/lirc/lircd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/lircd.conf
-
-PID=$(pidof -o %PPID /usr/sbin/lircd)
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
-case "$1" in
-  start)
-    stat_busy "Starting LIRC Daemon"
-   [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
-    rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
-    if [ $? -ne 0 ]; then
-      stat_fail
-      exit 0
-    fi
-    [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
-    [ -z "$PID" ] && 
-      if [ -n "$LIRC_DEVICE" ] ; then
-        eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      else
-        /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      fi
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LIRC Daemon"
-    rm -f $LIRCD_SYMLINKFILE
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start|stop|restart"
-esac
-exit 0
diff --git a/testing/lirc/lircd-handle-large-config.patch b/testing/lirc/lircd-handle-large-config.patch
deleted file mode 100644
index 85bc20518..000000000
--- a/testing/lirc/lircd-handle-large-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Wed, 6 Apr 2011 11:04:12 -0400
-Subject: [PATCH] lircd: handle larger config files in write_socket better
-
-Pointed out by Michael Zanetti on list, irsend LIST has issues with long
-config files, which didn't exist in maintainer mode, as we were using a
-do while loop to make sure we spit out everything. Just use that loop
-all the time.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- daemons/lircd.c |    8 ++------
- 1 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 6c21a3a..ddcca05 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
- 	int done, todo = len;
- 
- 	while (todo) {
--#ifdef SIM_REC
- 		do {
- 			done = write(fd, buf, todo);
--		}
--		while (done < 0 && errno == EAGAIN);
--#else
--		done = write(fd, buf, todo);
--#endif
-+		} while (done < 0 && errno == EAGAIN);
-+
- 		if (done <= 0)
- 			return (done);
- 		buf += done;
--- 
-1.7.0.1
-
diff --git a/testing/lirc/lircd.conf b/testing/lirc/lircd.conf
deleted file mode 100644
index 760dab065..000000000
--- a/testing/lirc/lircd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""
diff --git a/testing/lirc/lircmd b/testing/lirc/lircmd
deleted file mode 100755
index 220c47c9c..000000000
--- a/testing/lirc/lircmd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lircmd`
-case "$1" in
-  start)
-    stat_busy "Starting lircmd Daemon"
-    [ -z "$PID" ] && /usr/sbin/lircmd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircmd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping lircmd Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircmd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/lm_sensors/PKGBUILD b/testing/lm_sensors/PKGBUILD
deleted file mode 100644
index d72fea0c9..000000000
--- a/testing/lm_sensors/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 164348 2012-07-31 04:47:30Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=lm_sensors
-pkgver=3.3.2
-pkgrel=4
-pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
-arch=('i686' 'x86_64')
-url="http://www.lm-sensors.org/"
-license=('GPL' 'LGPL')
-depends=('perl' 'sysfsutils')
-makedepends=('rrdtool')
-optdepends=('rrdtool: for logging with sensord')
-backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
-options=('!emptydirs')
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
-	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
-        sensord.rc fancontrol.service sensord.service healthd.service \
-        daemonarg.patch linux_3.0.patch)
-sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
-          'a486d9fb6c5b0aff4520f6312106c67f5163f1cf'
-          'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
-          'a068ac0a3115a6191a487e11422506baa922b40a'
-          'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
-          '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          'de5a46afc39a77ae8721246a0223baf21a2d4c9c'
-          'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
-          '72a60251d1d55a67307dab4105d9f3f01a080af4'
-          '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
-          'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
-          '9cc453eb0e9f9057227459cb07e74815383544bf'
-          '34241388c4001bfb6e49b7e10da1217e29a258d6'
-          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
-         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
-  sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
-  sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
-  patch -p1 < ../daemonarg.patch
-  patch -p0 < ../linux_3.0.patch
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
-    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
-  install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
-  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
-  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
-  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd"
-  install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
-  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
-  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
-  install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
-  install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
-  install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
-}
diff --git a/testing/lm_sensors/daemonarg.patch b/testing/lm_sensors/daemonarg.patch
deleted file mode 100644
index 4b80cef19..000000000
--- a/testing/lm_sensors/daemonarg.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
---- lm_sensors-3.1.2-1/prog/pwm/fancontrol	2010-02-03 03:45:15.000000000 +0100
-+++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol	2010-03-07 01:37:09.000000000 +0100
-@@ -5,7 +5,9 @@
- #
- # Version 0.70
- #
--# Usage: fancontrol [CONFIGFILE]
-+# Usage: fancontrol [-D] [CONFIGFILE]
-+#
-+# (-D causes fancontrol to 'fork' to the background after some tests)
- #
- # Dependencies:
- #   bash, egrep, sed, cut, sleep, readlink, lm_sensors :)
-@@ -43,6 +45,12 @@
- #DEBUG=1
- MAX=255
- 
-+DAEMON=0
-+if [ "$1" = "-D" ]; then
-+	DAEMON=1
-+	shift
-+fi
-+
- declare -i pwmval
- 
- function LoadConfig {
-@@ -303,7 +311,6 @@
- 	echo "File $PIDFILE exists, is fancontrol already running?"
- 	exit 1
- fi
--echo $$ > "$PIDFILE"
- 
- # $1 = pwm file name
- function pwmdisable()
-@@ -475,6 +482,14 @@
- 	let fcvcount=$fcvcount+1
- done
- 
-+if [ "$DAEMON" -gt 0 ]; then
-+	echo "Forking..."
-+	$0 $* &> /dev/null &
-+	exit 0
-+fi
-+
-+echo $$ > "$PIDFILE"
-+
- echo 'Starting automatic fan control...'
- 
- # main loop calling the main function at specified intervals
diff --git a/testing/lm_sensors/fancontrol.rc b/testing/lm_sensors/fancontrol.rc
deleted file mode 100644
index 8e98d06f2..000000000
--- a/testing/lm_sensors/fancontrol.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
-case "$1" in
-  start)
-    stat_busy "Starting fancontrol"
-    [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
-    if [ $? -gt 0 -o -n "$PID" ]; then
-      stat_fail
-    else
-      add_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fancontrol"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/lm_sensors/fancontrol.service b/testing/lm_sensors/fancontrol.service
deleted file mode 100644
index c86b498f8..000000000
--- a/testing/lm_sensors/fancontrol.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/lm_sensors/healthd b/testing/lm_sensors/healthd
deleted file mode 100644
index 5ffed5681..000000000
--- a/testing/lm_sensors/healthd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/sbin/healthd
-#
-
-. /etc/healthd.conf
-
-cmd="${ALARM_CMD}"
-addr="${ADMIN_EMAIL}"
-slp="${ALARM_SLEEP}"
-sensors="/usr/bin/sensors"
-
-
-while [ $# -gt 0 ] ; do
-	case "${1}" in
-		-c ) cmd="${2}" ; shift 2 ;;
-		-m ) addr="${2}" ; shift 2 ;;
-		-s ) slp="${2}" ; shift 2 ;;
-		*  ) shift 1 ;;
-	esac
-done
-
-case "${ALARM_RESET}" in
-	yes) /usr/bin/sensors > /dev/null
-	;;
-        no) true
-	;;
-esac
-
-[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
-	[ -n "${addr}" ] || exit 1
-
-[ "${slp}" -ge 2 ] || slp=600
-
-while true ; do
-	sleep 15
-	message="$( $sensors )"
-	case "$message" in
-		''      ) message='Could not get any sensor values !' ;;
-		*ALARM* ) : ;;
-		*       ) message='' ;;
-	esac
-	if [ -n "$message" ]; then
-		if [ -n "${addr}" ]; then
-			echo "$message" | mail -s \
-				"Sensors ALARM detected at host: $( hostname )" \
-				"${addr}"
-		fi
-		[ -z "${cmd}" ] || ${cmd} &
-		sleep ${slp}
-	fi
-done &
diff --git a/testing/lm_sensors/healthd.conf b/testing/lm_sensors/healthd.conf
deleted file mode 100644
index a8b2c3fa3..000000000
--- a/testing/lm_sensors/healthd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# /etc/conf.d/healthd
-#
-
-# reset any pending alarms on startup
-ALARM_RESET="yes"
-
-# where to sent mails on alarm
-ADMIN_EMAIL="root"
-
-# Seconds to sleep when alarm detected before checking again
-# If you want to fill up your mail inbox set this to 2. ;-)
-ALARM_SLEEP=600
-
-# command to run in background on each alarm
-# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
-ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
diff --git a/testing/lm_sensors/healthd.rc b/testing/lm_sensors/healthd.rc
deleted file mode 100644
index f50f4a6f8..000000000
--- a/testing/lm_sensors/healthd.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -x -o %PPID /usr/sbin/healthd)
-case "${1}" in
-  start)
-    stat_busy "Starting Health Daemon"
-    [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo "${PID}" > /var/run/healthd.pid
-      add_daemon healthd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Health Daemon"
-    [ ! -z "${PID}" ] && kill ${PID} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon healthd
-      stat_done
-    fi
-    ;;
-  restart) 
-    $0 stop 
-    sleep 2
-    $0 start 
-    ;;
-  *) echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/lm_sensors/healthd.service b/testing/lm_sensors/healthd.service
deleted file mode 100644
index b894fbb1f..000000000
--- a/testing/lm_sensors/healthd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
-
-[Service]
-PIDFile=/var/run/healthd.pid
-ExecStart=/usr/sbin/healthd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/lm_sensors/linux_3.0.patch b/testing/lm_sensors/linux_3.0.patch
deleted file mode 100644
index da02a3d49..000000000
--- a/testing/lm_sensors/linux_3.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prog/detect/sensors-detect	2011-08-02 10:23:46.000000000 +0200
-+++ prog/detect/sensors-detect	2011-08-02 10:24:04.000000000 +0200
-@@ -2472,7 +2472,7 @@
- 
- sub initialize_kernel_version
- {
--	`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
-+	`uname -r` =~ /(\d+)\.(\d+)(.*)/;
- 	@kernel_version = ($1, $2, $3, $4);
- 	chomp($kernel_arch = `uname -m`);
- 
diff --git a/testing/lm_sensors/sensord.conf b/testing/lm_sensors/sensord.conf
deleted file mode 100644
index a1cf091c1..000000000
--- a/testing/lm_sensors/sensord.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sensord
-#
-SENSORD_ARGS=""
diff --git a/testing/lm_sensors/sensord.rc b/testing/lm_sensors/sensord.rc
deleted file mode 100644
index e3ef4d26d..000000000
--- a/testing/lm_sensors/sensord.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sensord
-
-PID=$(pidof -o %PPID /usr/sbin/sensord)
-case "$1" in
-  start)
-    stat_busy "Starting sensord"
-    [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensord
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping sensord"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensord
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/lm_sensors/sensord.service b/testing/lm_sensors/sensord.service
deleted file mode 100644
index 6d272f1ef..000000000
--- a/testing/lm_sensors/sensord.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/lm_sensors/sensors.rc b/testing/lm_sensors/sensors.rc
deleted file mode 100644
index 4acde2202..000000000
--- a/testing/lm_sensors/sensors.rc
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# description: sensors is used for monitoring motherboard sensor values.
-# config: /etc/conf.d/lm_sensors
-
-# See also the lm_sensors homepage at:
-#     http://www2.lm-sensors.nu/~lm78/index.html
-
-# It uses a config file /etc/conf.d/lm_sensors that contains the modules to
-# be loaded/unloaded. That file is sourced into this one.
-
-# The format of that file a shell script that simply defines the modules
-# in order as normal shell variables with the special names:
-#    MODULE_1, MODULE_2, MODULE_3, etc.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PSENSORS=/usr/bin/sensors
-
-if $(grep -q sysfs /proc/mounts); then
-  WITHSYS=1
-else
-  WITHSYS=0
-fi
-
-if [ $WITHSYS == "0" ]; then
-  # If sensors isn't supported by the kernel, try loading the module...
-  [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
-
-  # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors.
-  if ! [ -e /proc/sys/dev/sensors ]; then
-    echo  "lm_sensors: kernel does not have sensors support"
-    stat_fail
-  fi
-
-  # If sensors was not already running, unload the module...
-  [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
-fi
-
-if [ -e /etc/conf.d/lm_sensors ]; then
-  CONFIG=/etc/conf.d/lm_sensors
-elif [ -e /etc/sysconfig/lm_sensors ]; then
-  # Moving config to new Arch-specific location
-  mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors
-  CONFIG=/etc/conf.d/lm_sensors
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Up Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=0
-      while [ $i -lt $modules ] ; do
-        module=$(eval echo '$'MODULE_$i)
-       # echo starting module __${module}__ #debug
-        /sbin/modprobe $module &>/dev/null
-        i=$(expr $i + 1)
-      done
-    fi
-
-    $PSENSORS -s
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensors
-      stat_done
-    fi	  
-    ;;
-
-  stop)
-    stat_busy "Shutting Down Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=$(expr $modules - 1)
-      while [ $i -ge 0 ] ; do
-        module=$(eval echo '$'MODULE_$i)
-      #  echo stoping module __${module}__ #debug
-        /sbin/modprobe -r $module &>/dev/null
-        i=$(expr $i - 1)
-      done
-    fi
-
-    if [ $WITHSYS == "0" ]; then
-      /sbin/modprobe -r i2c-proc &>/dev/null
-    fi
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensors
-      stat_done
-    fi
-    ;;
-    
-  status)
-    $PSENSORS
-    ;;
-    
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  condrestart)
-    [ -e /var/run/daemons/sensors ] && $0 restart || :
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart|status|condrestart}"
-esac
-exit 0
diff --git a/testing/logrotate/PKGBUILD b/testing/logrotate/PKGBUILD
deleted file mode 100644
index 7ad4ebd03..000000000
--- a/testing/logrotate/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 164699 2012-08-03 08:05:59Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=logrotate
-pkgver=3.8.2
-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"
-        'noasprintf.patch'
-        'paths.patch'
-        'logrotate.conf'
-        'logrotate.cron.daily')
-md5sums=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
-         'cd76976b5ce37d328b452c806b55a015'
-         'e76526bcd6fc33c9d921e1cb1eff1ffb'
-         '462a5f364717461537eb2ae6394ad23e'
-         'aa8ac8283908b6114483a293adcb650f')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  patch -p0 -i "$srcdir/noasprintf.patch"
-  patch -p0 -i "$srcdir/paths.patch"
-
-  make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
-}
-
-check() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make PREFIX="$pkgdir" MANDIR="/usr/share/man" 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 ee0eeeb48..000000000
--- a/testing/logrotate/logrotate.cron.daily
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf"
- 
-if [ -x /usr/bin/nice ]; then
-  CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}"
-fi
- 
-if [ -x /usr/bin/ionice ]; then
-  CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
-fi
- 
-${CMD_LOGROTATE}
- 
-exit 0
diff --git a/testing/logrotate/noasprintf.patch b/testing/logrotate/noasprintf.patch
deleted file mode 100644
index 3df943b64..000000000
--- a/testing/logrotate/noasprintf.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- config.c	2011-06-21 04:12:02.000000000 -0400
-+++ 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.h	2011-06-21 04:12:02.000000000 -0400
-+++ 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/paths.patch b/testing/logrotate/paths.patch
deleted file mode 100644
index 83166b095..000000000
--- a/testing/logrotate/paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- config.h	2012-08-01 12:56:47.000000000 +0200
-+++ config.h	2012-08-03 09:53:05.025039199 +0200
-@@ -27,11 +27,11 @@
-  * Default settings for Linux - leave these last.
-  */
- #ifndef DEFAULT_MAIL_COMMAND
--#define DEFAULT_MAIL_COMMAND "/bin/mail"
-+#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"
- #endif
- 
- #ifndef COMPRESS_COMMAND
--#define COMPRESS_COMMAND "/bin/gzip"
-+#define COMPRESS_COMMAND "/usr/bin/gzip"
- #endif
- 
- #ifndef COMPRESS_EXT
-@@ -39,7 +39,7 @@
- #endif
- 
- #ifndef UNCOMPRESS_COMMAND
--#define UNCOMPRESS_COMMAND "/bin/gunzip"
-+#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
- #endif
- 
- #ifndef STATEFILE
diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules
deleted file mode 100644
index d2c167324..000000000
--- a/testing/lvm2/11-dm-initramfs.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# needed with new udev/mkinitcpio and as implemented in dracut:
-# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
-SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
deleted file mode 100644
index 184226746..000000000
--- a/testing/lvm2/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 168776 2012-10-15 21:23:50Z thomas $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.98
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://sourceware.org/lvm2/"
-license=('GPL2' 'LGPL2.1')
-groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
-        lvm2_install
-        lvm2_hook
-        11-dm-initramfs.rules
-        lvm.service
-	lvm-on-crypt.service
-        lvm2.conf)
-sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
-          '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
-          '3e1680f9b76ce9150d08865d99db90fd15532271'
-          'cedc9948123c870f9c5aa3357d0075b41a9c8135'
-          'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'edce6b6e8d03f7cbad4bfff49fab01d618415be8'
-          '652fb58dd7676caa0515f0a06d537744e071c6cf'
-          'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
-
-build() {
-  cd "${srcdir}/LVM2.${pkgver}"
-  unset LDFLAGS
-
-  ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
-    --includedir=/usr/include --with-usrlibdir=/usr/lib  --libdir=/usr/lib --with-udev-prefix=/usr \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
-    --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules  \
-    --with-default-locking-dir=/run/lock/lvm
-  make
-}
-
-package_device-mapper() {
-  pkgdesc="Device mapper userspace library and tools"
-  url="http://sourceware.org/dm/"
-  depends=('glibc' 'udev')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_device-mapper
-  # extra udev rule for device-mapper in initramfs
-  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
-}
-
-package_lvm2() {
-  pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
-  conflicts=('lvm' 'mkinitcpio<0.7')
-  backup=('etc/lvm/lvm.conf')
-  options=('!makeflags')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_lvm2
-  # install applib
-  make -C liblvm DESTDIR="${pkgdir}" install
-  # /etc directories
-  install -d "${pkgdir}"/etc/lvm/{archive,backup}
-  # mkinitcpio hook
-  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
-  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
-  # systemd support
-  install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service"
-  install -D -m644 "${srcdir}/lvm-on-crypt.service" "${pkgdir}/usr/lib/systemd/system/lvm-on-crypt.service"
-  install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf"
-}
diff --git a/testing/lvm2/lvm-on-crypt.service b/testing/lvm2/lvm-on-crypt.service
deleted file mode 100644
index 346c5ac8e..000000000
--- a/testing/lvm2/lvm-on-crypt.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation of encrypted devices
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service cryptsetup.target
-Before=shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
diff --git a/testing/lvm2/lvm.service b/testing/lvm2/lvm.service
deleted file mode 100644
index 14269b1be..000000000
--- a/testing/lvm2/lvm.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service
-Before=basic.target shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
diff --git a/testing/lvm2/lvm2.conf b/testing/lvm2/lvm2.conf
deleted file mode 100644
index 129824552..000000000
--- a/testing/lvm2/lvm2.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/lock/lvm 0755 root root -
-d /run/lvm 0755 root root -
diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook
deleted file mode 100644
index e69b3349a..000000000
--- a/testing/lvm2/lvm2_hook
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    local pvdev
-
-    modprobe -q dm-mod >/dev/null 2>&1
-
-    # If the lvmwait= parameter has been specified on the command line
-    # wait for the device(s) before trying to activate the volume group(s)
-    for pvdev in ${lvmwait//,/ }; do
-        poll_device ${pvdev} ${rootdelay}
-    done
-
-    msg "Activating logical volumes..."
-    [ -d /etc/lvm ] && lvm vgscan
-
-    if [ -n "$quiet" ]; then
-      lvm vgchange --sysinit -a y >/dev/null
-    else
-      lvm vgchange --sysinit -a y
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install
deleted file mode 100644
index 145ce49b2..000000000
--- a/testing/lvm2/lvm2_install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-build() {
-    local mod
-    for mod in dm-mod dm-snapshot dm-mirror; do
-        add_module "$mod"
-    done
-
-    add_binary "/sbin/lvm"
-    add_binary "/sbin/dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-
-    add_runscript
-}
-
-help() {
-  cat <<HELPEOF
-This hook loads the necessary modules for an LVM2 root device.
-
-The optional lvmwait= parameter followed by a comma-separated
-list of device names can be given on the command line.
-It will cause the hook to wait until all given devices exist
-before trying to scan and activate any volume groups.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/lyx/PKGBUILD b/testing/lyx/PKGBUILD
deleted file mode 100644
index d0f9cfa5d..000000000
--- a/testing/lyx/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 163552 2012-07-15 13:17:17Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=lyx
-pkgver=2.0.3
-pkgrel=4
-pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
-arch=('i686' 'x86_64')
-url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
-makedepends=('boost')
-optdepends=('rcs: built-in version control system'
-            'texlive-latexextra: float wrap support')
-license=('GPL')
-source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
-        lyx.desktop lyxrc.dist)
-backup=('etc/lyx/lyxrc.dist')
-install=lyx.install
-options=('emptydirs')
-sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
-          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
-          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
-  sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-  ./configure --prefix=/usr \
-    --with-frontend=qt4 --without-included-boost \
-    --without-included-mythes
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  # install desktop entry
-  install -Dm644 "${srcdir}/lyx.desktop" \
-    "${pkgdir}/usr/share/applications/lyx.desktop"
-  install -Dm644 "lib/images/lyx.png" \
-    "${pkgdir}/usr/share/pixmaps/lyx.png"
-
-  # install default config file
-  install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
-  ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
-}
diff --git a/testing/lyx/lyx.desktop b/testing/lyx/lyx.desktop
deleted file mode 100644
index 649b30c98..000000000
--- a/testing/lyx/lyx.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LyX Document Processor
-GenericName=Document Processor
-Comment=High level LaTeX frontend
-Exec=lyx %F
-TryExec=lyx
-Icon=lyx
-StartupNotify=false
-StartupWMClass=Lyx
-Terminal=false
-Categories=Office;WordProcessor;Qt;
-MimeType=text/x-lyx;application/x-lyx;
diff --git a/testing/lyx/lyx.install b/testing/lyx/lyx.install
deleted file mode 100644
index c15c17b3a..000000000
--- a/testing/lyx/lyx.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
-
-
diff --git a/testing/lyx/lyxrc.dist b/testing/lyx/lyxrc.dist
deleted file mode 100644
index dd18694f9..000000000
--- a/testing/lyx/lyxrc.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-### This file is part of
-### ========================================================
-###          LyX, The Document Processor
-###
-###          Copyright 1995 Matthias Ettrich
-###          Copyright 1995-2011 The LyX Team.
-###
-### ========================================================
-
-# The file lyxrc.dist gives initial global options for all LyX users.
-# Almost all settings here can be overridden through the preferences in LyX.
-
-\thesaurusdir_path "/usr/share/mythes"
-\hunspelldir_path "/usr/share/myspell"
diff --git a/testing/make/PKGBUILD b/testing/make/PKGBUILD
deleted file mode 100644
index 428b4d925..000000000
--- a/testing/make/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 166640 2012-09-14 04:44:29Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=make
-pkgver=3.82
-pkgrel=5
-pkgdesc="GNU make utility to maintain groups of programs"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/make"
-license=('GPL3')
-groups=('base-devel')
-depends=('glibc' 'sh')
-install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        make-3.82-bug30612.patch
-        make-3.82-bug30723.patch
-        make-3.82-sort-blank.patch
-        make-3.82-makeflags.patch
-        make-3.82-expensive_glob.patch
-        make-3.82-dont-prune-intermediate.patch)
-md5sums=('1a11100f3c63fcf5753818e59d63088f'
-         'c78daf24f4ec5900c8f81e89a6e1cd5a'
-         'c8f496b22191f9fb9420ab14c1a19a47'
-         '662e6450e19a5acdaa5c9fcb8ad78dea'
-         '7d01a99f389d8f08dec93ed479071ee4'
-         'bc12ad4d0c6e6c0e72d9fb61054f446b'
-         'e58d4211c5b29d7d927a304d082849e7'
-         '45ac9e987f4bf16c0d7e1685db943917')
-
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # http://savannah.gnu.org/bugs/?30612
-  patch -Np1 -i $srcdir/make-3.82-bug30612.patch
-  
-  # http://savannah.gnu.org/bugs/?30723
-  patch -Np1 -i $srcdir/make-3.82-bug30723.patch
-  
-  # https://bugs.archlinux.org/task/22733 (fix from Fedora)
-  patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
-  
-  # https://savannah.gnu.org/bugs/?33873
-  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
-  
-  # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html
-  patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch
- 
-  # https://savannah.gnu.org/bugs/?30653
-  patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/make/make-3.82-bug30612.patch b/testing/make/make-3.82-bug30612.patch
deleted file mode 100644
index fb843bcd9..000000000
--- a/testing/make/make-3.82-bug30612.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
---- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30612//main.c	2010-09-23 23:33:37.908855839 +1000
-@@ -1,3 +1,4 @@
-+
- /* Argument parsing and main program of GNU Make.
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-@@ -1138,7 +1139,7 @@
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
--                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
-diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
---- make-3.82-orig/read.c	2010-07-13 11:20:42.000000000 +1000
-+++ make-3.82-fix30612//read.c	2010-09-23 23:30:58.018855839 +1000
-@@ -3028,7 +3028,7 @@
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3084,19 @@
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
-@@ -3152,7 +3152,11 @@
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
-+
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
diff --git a/testing/make/make-3.82-bug30723.patch b/testing/make/make-3.82-bug30723.patch
deleted file mode 100644
index 84e7ebe7a..000000000
--- a/testing/make/make-3.82-bug30723.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
---- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30723//main.c	2010-09-23 23:34:10.932188592 +1000
-@@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
diff --git a/testing/make/make-3.82-dont-prune-intermediate.patch b/testing/make/make-3.82-dont-prune-intermediate.patch
deleted file mode 100644
index f4f47dd27..000000000
--- a/testing/make/make-3.82-dont-prune-intermediate.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-2012-09-09  Paul Smith  <psmith@gnu.org>
-
-	* remake.c (update_file_1): Force intermediate files to be
-	considered, not pruned, if their non-intermediate parent needs to
-	be remade.  Fixes Savannah bug #30653.
-
-Index: remake.c
-===================================================================
-RCS file: /sources/make/make/remake.c,v
-retrieving revision 1.153
-retrieving revision 1.154
-diff -u -r1.153 -r1.154
---- remake.c	5 Mar 2012 14:10:45 -0000	1.153
-+++ remake.c	10 Sep 2012 02:36:05 -0000	1.154
-@@ -612,6 +612,10 @@
-                 d->file->dontcare = file->dontcare;
-               }
- 
-+            /* We may have already considered this file, when we didn't know
-+               we'd need to update it.  Force update_file() to consider it and
-+               not prune it.  */
-+            d->file->considered = !considered;
- 
- 	    dep_status |= update_file (d->file, depth);
- 
-Index: tests/scripts/features/parallelism
-===================================================================
-RCS file: /sources/make/make/tests/scripts/features/parallelism,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -u -r1.19 -r1.20
---- tests/scripts/features/parallelism	4 Mar 2012 00:24:32 -0000	1.19
-+++ tests/scripts/features/parallelism	10 Sep 2012 02:36:05 -0000	1.20
-@@ -214,6 +214,23 @@
-     rmfiles(qw(foo.y foo.y.in main.bar));
- }
- 
-+# Ensure intermediate/secondary files are not pruned incorrectly.
-+# See Savannah bug #30653
-+
-+utouch(-15, 'file2');
-+utouch(-10, 'file4');
-+utouch(-5,  'file1');
-+
-+run_make_test(q!
-+.INTERMEDIATE: file3
-+file4: file3 ; @mv -f $< $@
-+file3: file2 ; touch $@
-+file2: file1 ; @touch $@
-+!,
-+              '--no-print-directory -j2', "touch file3");
-+
-+#rmfiles('file1', 'file2', 'file3', 'file4');
-+
- if ($all_tests) {
-     # Jobserver FD handling is messed up in some way.
-     # Savannah bug #28189
diff --git a/testing/make/make-3.82-expensive_glob.patch b/testing/make/make-3.82-expensive_glob.patch
deleted file mode 100644
index 8663f5039..000000000
--- a/testing/make/make-3.82-expensive_glob.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: read.c
-===================================================================
-RCS file: /sources/make/make/read.c,v
-retrieving revision 1.198
-retrieving revision 1.200
-diff -u -r1.198 -r1.200
---- read.c	29 Apr 2011 15:27:39 -0000	1.198
-+++ read.c	7 May 2011 14:36:12 -0000	1.200
-@@ -2901,6 +2901,7 @@
-       const char *name;
-       const char **nlist = 0;
-       char *tildep = 0;
-+      int globme = 1;
- #ifndef NO_ARCHIVES
-       char *arname = 0;
-       char *memname = 0;
-@@ -3109,32 +3110,40 @@
- 	}
- #endif /* !NO_ARCHIVES */
- 
--      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
--	{
--	case GLOB_NOSPACE:
--	  fatal (NILF, _("virtual memory exhausted"));
--
--	case 0:
--          /* Success.  */
--          i = gl.gl_pathc;
--          nlist = (const char **)gl.gl_pathv;
--          break;
--
--        case GLOB_NOMATCH:
--          /* If we want only existing items, skip this one.  */
--          if (flags & PARSEFS_EXISTS)
--            {
--              i = 0;
--              break;
--            }
--          /* FALLTHROUGH */
--
--	default:
--          /* By default keep this name.  */
-+      /* glob() is expensive: don't call it unless we need to.  */
-+      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+        {
-+          globme = 0;
-           i = 1;
-           nlist = &name;
--          break;
--	}
-+        }
-+      else
-+        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+          {
-+          case GLOB_NOSPACE:
-+            fatal (NILF, _("virtual memory exhausted"));
-+
-+          case 0:
-+            /* Success.  */
-+            i = gl.gl_pathc;
-+            nlist = (const char **)gl.gl_pathv;
-+            break;
-+
-+          case GLOB_NOMATCH:
-+            /* If we want only existing items, skip this one.  */
-+            if (flags & PARSEFS_EXISTS)
-+              {
-+                i = 0;
-+                break;
-+              }
-+            /* FALLTHROUGH */
-+
-+          default:
-+            /* By default keep this name.  */
-+            i = 1;
-+            nlist = &name;
-+            break;
-+          }
- 
-       /* For each matched element, add it to the list.  */
-       while (i-- > 0)
-@@ -3174,7 +3183,8 @@
- #endif /* !NO_ARCHIVES */
-           NEWELT (concat (2, prefix, nlist[i]));
- 
--      globfree (&gl);
-+      if (globme)
-+        globfree (&gl);
- 
- #ifndef NO_ARCHIVES
-       if (arname)
-Index: tests/scripts/functions/wildcard
-===================================================================
-RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- tests/scripts/functions/wildcard	13 Jun 2009 21:21:49 -0000	1.6
-+++ tests/scripts/functions/wildcard	7 May 2011 14:36:11 -0000	1.7
-@@ -88,4 +88,16 @@
- !,
-               '', "\n");
- 
-+# TEST #5: wildcard used to verify file existence
-+
-+touch('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+              '', "file=xxx.yyy\n");
-+
-+unlink('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+              '', "file=\n");
-+
- 1;
diff --git a/testing/make/make-3.82-makeflags.patch b/testing/make/make-3.82-makeflags.patch
deleted file mode 100644
index 3cba3c402..000000000
--- a/testing/make/make-3.82-makeflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.246
-diff -u -r1.246 main.c
---- main.c	29 Aug 2010 23:05:27 -0000	1.246
-+++ main.c	27 Jul 2011 22:03:12 -0000
-@@ -2091,10 +2095,16 @@
- 
-           /* Reset makeflags in case they were changed.  */
-           {
-+            if (master_job_slots)
-+              {
-+                assert (job_slots == default_job_slots);
-+                job_slots = master_job_slots;
-+              }
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
-             putenv (allocated_variable_expand (p));
-+            job_slots = default_job_slots;
-           }
- 
- 	  if (ISDB (DB_BASIC))
-@@ -2825,9 +2852,11 @@
- 		       && (*(unsigned int *) cs->value_ptr ==
- 			   *(unsigned int *) cs->noarg_value))
- 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
-+#if 0
- 	      else if (cs->c == 'j')
- 		/* Special case for `-j'.  */
- 		ADD_FLAG ("1", 1);
-+#endif
- 	      else
- 		{
- 		  char *buf = alloca (30);
diff --git a/testing/make/make-3.82-sort-blank.patch b/testing/make/make-3.82-sort-blank.patch
deleted file mode 100644
index 2e73f5b7c..000000000
--- a/testing/make/make-3.82-sort-blank.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urp make-3.82/function.c make-3.82-pm/function.c
---- make-3.82/function.c	2010-07-13 03:20:39.000000000 +0200
-+++ make-3.82-pm/function.c	2010-10-27 01:43:27.000000000 +0200
-@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
-     {
-       char c = *(t++);
- 
--      if (! isspace ((unsigned char)c))
-+      if (! isblank ((unsigned char)c))
-         continue;
- 
-       ++wordi;
- 
--      while (isspace ((unsigned char)*t))
-+      while (isblank ((unsigned char)*t))
-         ++t;
-     }
diff --git a/testing/make/make.install b/testing/make/make.install
deleted file mode 100644
index 84260853c..000000000
--- a/testing/make/make.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(make.info make.info-1 make.info-2)
-
-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/man-db/PKGBUILD b/testing/man-db/PKGBUILD
deleted file mode 100644
index 9e2a3a8cd..000000000
--- a/testing/man-db/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 166764 2012-09-18 18:20:39Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-
-pkgname=man-db
-pkgver=2.6.3
-pkgrel=1
-pkgdesc="A utility for reading man pages"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/man-db/"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
-backup=('etc/man_db.conf'
-	'etc/cron.daily/man-db')
-conflicts=('man')
-provides=('man')
-replaces=('man')
-install=${pkgname}.install
-source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig}
-        convert-mans man-db.cron.daily)
-options=('!libtool')
-md5sums=('a593a095599ae97bcacf8d038659a146'
-         '64975c20b1a6453f9b860ff7f916bcf1'
-         '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'd30c39ae47560304471b5461719e0f03')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
-	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # part of groff pkg
-  rm -f ${pkgdir}/usr/bin/zsoelim
-
-  # script from LFS to convert manpages, see
-  # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html
-  install -D -m755 ${srcdir}/convert-mans  ${pkgdir}/usr/bin/convert-mans 
-
-  #install whatis cron script
-  install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db
-}
-
diff --git a/testing/man-db/convert-mans b/testing/man-db/convert-mans
deleted file mode 100644
index 58a0224b0..000000000
--- a/testing/man-db/convert-mans
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-FROM="$1"
-TO="$2"
-shift ; shift
-while [ $# -gt 0 ]
-do
-        FILE="$1"
-        shift
-        iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv
-        mv .tmp.iconv "$FILE"
-done
diff --git a/testing/man-db/man-db.cron.daily b/testing/man-db/man-db.cron.daily
deleted file mode 100755
index 53e66e1e9..000000000
--- a/testing/man-db/man-db.cron.daily
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEMANDB="/usr/bin/mandb --quiet"
-
-# Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
-
-# taken from Debian
-# man-db cron daily
-set -e
-
-if ! [ -d /var/cache/man ]; then
-    # Recover from deletion, per FHS.
-    mkdir -p /var/cache/man
-    chmod 755 /var/cache/man
-fi
-
-# regenerate man database
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}"
-fi
-
-${UPDATEMANDB}
-
-exit 0
diff --git a/testing/man-db/man-db.install b/testing/man-db/man-db.install
deleted file mode 100644
index f6f0f27a6..000000000
--- a/testing/man-db/man-db.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  echo "it's recommended to create an initial"
-  echo "database running as root:"
-  echo "\"/usr/bin/mandb --quiet\""
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then
-     echo "systemuser \"man\" is no more required"
-     echo "run \"userdel man\". please also"
-     echo "chown root:root /var/cache/man"
-  fi
-  # force database rebuild to get rid off badly imported pages
-  if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then
-     echo "(re)building database..."
-     mandb -c --quiet
-  fi
-}
-
-post_remove() {
-  rm -rf /var/cache/man
-}
diff --git a/testing/mediastreamer/PKGBUILD b/testing/mediastreamer/PKGBUILD
deleted file mode 100644
index 602e9f631..000000000
--- a/testing/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 163061 2012-07-06 15:21:41Z ibiru $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.8.2
-pkgrel=2
-pkgdesc="A library written in C that allows you to create and run audio and video streams"
-arch=('i686' 'x86_64')
-url="http://www.linphone.org/"
-license=('GPL')
-depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        mediastreamer-ffmpeg.patch)
-md5sums=('e51ea9d5fce1396b374d10473dfbadec'
-         '805da7def98f367e621363fa0c951fe8'
-         'f147546489a973f148ce3dd2dba36834')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mediastreamer/mediastreamer-ffmpeg.patch b/testing/mediastreamer/mediastreamer-ffmpeg.patch
deleted file mode 100644
index 944d4b833..000000000
--- a/testing/mediastreamer/mediastreamer-ffmpeg.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h
-index 5ae8a63..86edf86 100644
---- mediastreamer2/include/mediastreamer2/msvideo.h
-+++ mediastreamer2/include/mediastreamer2/msvideo.h
-@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #define msvideo_h
- 
- #include <mediastreamer2/msfilter.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
- /* some global constants for video MSFilter(s) */
- #define MS_VIDEO_SIZE_SQCIF_W 128
-@@ -206,7 +212,9 @@ extern "C"{
- MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt);
- MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt);
- MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- MS2_PUBLIC void ms_ffmpeg_check_init(void);
-+#endif
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m);
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h);
- MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h);
-diff --git a/src/h264dec.c b/src/h264dec.c
-index 223de3d..8c40a7c 100644
---- mediastreamer2/src/h264dec.c
-+++ mediastreamer2/src/h264dec.c
-@@ -44,7 +44,9 @@ typedef struct _DecData{
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
-diff --git a/src/mscommon.c b/src/mscommon.c
-index 2cab005..bebb946 100644
---- mediastreamer2/src/mscommon.c
-+++ mediastreamer2/src/mscommon.c
-@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include "mediastreamer2/mscodecutils.h"
- #include "mediastreamer2/msfilter.h"
- #include <ortp/ortp_srtp.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
- extern void __register_ffmpeg_encoders_if_possible(void);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- extern bool_t libmsandroiddisplay_init(void);
- extern void libmsandroiddisplaybad_init(void);
- extern void libmsandroidopengldisplay_init(void);
-@@ -645,7 +653,9 @@ void ms_init(){
- 		}
- 	}
- #if !defined(NO_FFMPEG)
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	__register_ffmpeg_encoders_if_possible();
- #endif
- #endif
-diff --git a/src/videodec.c b/src/videodec.c
-index c04e1e9..a455075 100644
---- mediastreamer2/src/videodec.c
-+++ mediastreamer2/src/videodec.c
-@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include "mediastreamer2/msvideo.h"
- #include "mediastreamer2/msticker.h"
- #include "rfc2429.h"
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
--
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- 
- 
- typedef struct DecState{
-@@ -50,7 +57,9 @@ typedef struct DecState{
- 
- static void dec_init(MSFilter *f, enum CodecID cid){
- 	DecState *s=(DecState *)ms_new0(DecState,1);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	
- 	avcodec_get_context_defaults(&s->av_context);
- 	s->av_codec=NULL;
-diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..520f06a 100644
---- mediastreamer2/src/videoenc.c
-+++ mediastreamer2/src/videoenc.c
-@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- static bool_t avcodec_initialized=FALSE;
-+#endif
- 
- #ifdef ENABLE_LOG_FFMPEG
- 
-@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
- 
- #endif
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
- 		avcodec_init();
-@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){
- #endif
- 	}
- }
-+#endif
- 
- /* the goal of this small object is to tell when to send I frames at startup:
- at 2 and 4 seconds*/
-@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec)
- {
- 	EncState *s=(EncState *)ms_new(EncState,1);
- 	f->data=s;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	s->profile=0;/*always default to profile 0*/
- 	s->comp_buf=NULL;
- 	s->fps=15;
-@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){
- 	if (s->profile==0){
- 		s->codec=CODEC_ID_H263;
- 	}else{
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		c->flags|=CODEC_FLAG_H263P_UMV;
-+#endif
- 		c->flags|=CODEC_FLAG_AC_PRED;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+#endif
- 		/*
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
-@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){
- 	// assume video size is CIF or QCIF
- 	if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
- 	else header->b_wptr[1] = 0x40;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
-+#else
-+	if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
-+#endif
- 	header->b_wptr += 4;
- 	header->b_cont = *packet;
- 	*packet = header;
-@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- 		s->req_vfu=TRUE;
- 	}
- 	if (s->req_vfu){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		pict.pict_type=FF_I_TYPE;
-+#else
-+		pict.pict_type=AV_PICTURE_TYPE_I;
-+#endif
- 		s->req_vfu=FALSE;
- 	}
- 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
-@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- 		if (s->framenum==1){
- 			video_starter_first_frame (&s->starter,f->ticker->time);
- 		}
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		if (c->coded_frame->pict_type==FF_I_TYPE){
-+#else
-+		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
-+#endif
- 			ms_message("Emitting I-frame");
- 		}
- 		comp_buf->b_wptr+=error;
-@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={
- #endif
- 
- void __register_ffmpeg_encoders_if_possible(void){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	if (avcodec_find_encoder(CODEC_ID_MPEG4))
- 		ms_filter_register(&ms_mpeg4_enc_desc);
- 	if (avcodec_find_encoder(CODEC_ID_H263)){
diff --git a/testing/memcached/PKGBUILD b/testing/memcached/PKGBUILD
deleted file mode 100644
index 540073226..000000000
--- a/testing/memcached/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165366 2012-08-16 14:41:50Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Michael Irwin <6d6469@gmail.com>
-
-pkgname=memcached
-pkgver=1.4.14
-pkgrel=2
-pkgdesc="A distributed memory object caching system"
-arch=(i686 x86_64)
-url="http://memcached.org/"
-license=('GPL')
-depends=('libevent')
-optdepends=('perl: for memcached-tool usage')
-backup=('etc/conf.d/memcached')
-install=memcached.install
-source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        memcached.conf
-		memcached.sh
-		memcached.service)
-sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef'
-            '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47'
-            '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb'
-            '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
-  install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached
-  install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached
-  install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
-}
diff --git a/testing/memcached/memcached.conf b/testing/memcached/memcached.conf
deleted file mode 100644
index 4415e1a55..000000000
--- a/testing/memcached/memcached.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="memcached"
-# see 'memcached -h' for available options
-MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
diff --git a/testing/memcached/memcached.install b/testing/memcached/memcached.install
deleted file mode 100644
index 6009b713f..000000000
--- a/testing/memcached/memcached.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  if ! getent group memcached >/dev/null; then
-    groupadd --system memcached
-  fi
-  if ! getent passwd memcached >/dev/null; then
-    useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
-    passwd -l memcached >/dev/null
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  if getent passwd memcached >/dev/null; then
-    userdel memcached
-  fi
-  if getent group memcached >/dev/null; then
-    groupdel memcached
-  fi
-}
diff --git a/testing/memcached/memcached.service b/testing/memcached/memcached.service
deleted file mode 100644
index c6e15fb7c..000000000
--- a/testing/memcached/memcached.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Memcached Daemon
-After=network.target
-
-[Service]
-User=memcached
-# Remove '-l 127.0.0.1' to listen on all addresses
-ExecStart=/usr/bin/memcached -l 127.0.0.1
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/memcached/memcached.sh b/testing/memcached/memcached.sh
deleted file mode 100644
index 9c9727507..000000000
--- a/testing/memcached/memcached.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/memcached
-
-PIDFILE='/var/run/memcached.pid'
-
-getpid() {
-  local pid
-  pid=$(cat $PIDFILE 2>/dev/null)
-  # if the process is no longer valid, don't return it
-  if [ -n "$pid" ]; then
-    if ! ps -p $pid >/dev/null; then
-      rm -f $PIDFILE
-      pid=""
-    fi
-  fi
-  echo $pid
-}
-
-PID="$(getpid)"
-
-case "$1" in
-  start)
-    stat_busy "Starting memcached"
-    # memcached is retarded and doesn't write to the pidfile
-    # before it drops permissions
-    if [ -n "$PID" ]; then
-      stat_fail
-    elif [ -z "$MEMCACHED_USER"  ]; then
-      echo "MEMCACHED_USER must be defined in /etc/conf.d/memcached"
-      stat_fail
-    else
-      touch $PIDFILE && chown $MEMCACHED_USER $PIDFILE
-      /usr/bin/memcached -d -P $PIDFILE -u $MEMCACHED_USER $MEMCACHED_ARGS
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon memcached
-        stat_done
-      fi
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping memcached"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f $PIDFILE
-      rm_daemon memcached
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/mesa/LICENSE b/testing/mesa/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/testing/mesa/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
deleted file mode 100644
index 22bb0c339..000000000
--- a/testing/mesa/PKGBUILD
+++ /dev/null
@@ -1,296 +0,0 @@
-# $Id: PKGBUILD 168375 2012-10-09 16:09:24Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=mesa
-pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
-
-#_git=true
-#_gitdate=20121006
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=8.99.git_$_gitdate
-  else
-    pkgver=9.0
-fi
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' 
-             'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-options=('!libtool')
-source=(LICENSE
-        git_fixes.diff)
-if [ "${_git}" = "true" ]; then
-	# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
-	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-7851d398def2df3f6836a500d67123eed50f3943.tar.gz")
-  else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-	#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
-)
-fi
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '2ebce12196dbb7b69bdf7ef53b8afdee'
-         '60e557ce407be3732711da484ab3db6c')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-    patch -Np1 -i ${srcdir}/git_fixes.diff
-
-    COMMONOPTS="--prefix=/usr \
-    --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
-    --enable-gallium-llvm \
-    --enable-egl \
-    --enable-gallium-egl \
-    --with-egl-platforms=x11,drm \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-vdpau "
-
-# not default:
-#    --enable-gallium-egl enable optional EGL state tracker (not required for
-#                          EGL support in Gallium with OpenGL and OpenGL ES)
-#                          [default=disable]
-#    --enable-xa             enable build of the XA X Acceleration API                          [default=no]
-
-
-if [ "${_git}" = "true" ]; then
-    ./autogen.sh \
-      $COMMONOPTS
-  else
-    autoreconf -vfi
-    ./configure \
-      $COMMONOPTS
-fi
-
-    make
-}
-
-package_libglapi() {
-  depends=('glibc')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
-
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
-}
-
-package_libgl() {
-  depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # libGL & libdricore
-  make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  # See FS#26284
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_mesa() {
-  # check also gl.pc
-  depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3-D graphics libraries and include files"
-
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS  
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA  
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_osmesa() {
-  depends=('libglapi' 'gcc-libs')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/osmesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/"
-}
-
-package_libgbm() {
-  depends=('systemd' 'libglapi' 'libdrm')
-  pkgdesc="Mesa gbm library"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
-}
-
-package_libgles() {
-  depends=('libglapi' 'libdrm' 'khrplatform-devel')
-  pkgdesc="Mesa GLES libraries and headers"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
-}
-
-package_libegl() {
-  # check also egl.pc
-  depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel')
-  pkgdesc="Mesa EGL libraries and headers"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/doc/libegl"
-  install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
-  
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
-  
-  make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
-  
-  # fix file conflicts
-  rm -rf ${pkgdir}/usr/include/KHR
-}
-
-package_khrplatform-devel() {
-  pkgdesc="Khronos platform development package"
-
-  install -m755 -d "${pkgdir}/usr/include/KHR"
-  install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" 
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
-}
-
-package_ati-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-  
-  # classic mesa drivers for radeon,r200
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600,radeonsi
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
-  # vdpau driver
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
-}
-
-package_intel-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
-}
-
-package_nouveau-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-  # vdpau driver
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
-}
-
-package_svga-dri() {
-  depends=('gcc-libs' 'libdrm' 'expat')
-  pkgdesc="Gallium3D VMware guest GL driver"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/"
-}
diff --git a/testing/mesa/git_fixes.diff b/testing/mesa/git_fixes.diff
deleted file mode 100644
index 8132d1d10..000000000
--- a/testing/mesa/git_fixes.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
-From: Ian Romanick <ian.d.romanick@intel.com>
-Date: Mon, 08 Oct 2012 22:07:10 +0000
-Subject: docs: Add 9.0 release md5sums
-
-Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
----
-diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
-index d72c5bb..02b7324 100644
---- a/docs/relnotes-9.0.html
-+++ b/docs/relnotes-9.0.html
-@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
- 
- <h2>MD5 checksums</h2>
- <pre>
--tbd
-+be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
-+60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
-+16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
- </pre>
- 
- 
---
-cgit v0.9.0.2-2-gbebe
-From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:47:40 +0000
-Subject: mesa: don't call TexImage driver hooks for zero-sized images
-
-This simply avoids some failed assertions but there's no reason to
-call the driver hooks for storing a tex image if its size is zero.
-
-Note: This is a candidate for the stable branches.
-(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 21646cc..8004876 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
-                                           border, internalFormat, texFormat);
- 
-                /* Give the texture to the driver.  <pixels> may be null. */
--               if (compressed) {
--                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
--                                                 imageSize, pixels);
--               }
--               else {
--                  ctx->Driver.TexImage(ctx, dims, texImage, format,
--                                       type, pixels, unpack);
-+               if (width > 0 && height > 0 && depth > 0) {
-+                  if (compressed) {
-+                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
-+                                                    imageSize, pixels);
-+                  }
-+                  else {
-+                     ctx->Driver.TexImage(ctx, dims, texImage, format,
-+                                          type, pixels, unpack);
-+                  }
-                }
- 
-                check_gen_mipmap(ctx, target, texObj, level);
---
-cgit v0.9.0.2-2-gbebe
-From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:59:27 +0000
-Subject: mesa: fix error check for zero-sized compressed subtexture
-
-For glCompressedTexSubImage, width or height = 0 is legal.
-Fixes a failure in piglit's s3tc-errors test.
-
-This is for the 9.0 and 8.0 branches.  Already fixed on master.
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 8004876..38fa9fa 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
-    if (!_mesa_is_compressed_format(ctx, format))
-       return GL_INVALID_ENUM;
- 
--   if (width < 1 || width > maxTextureSize)
-+   if (width < 0 || width > maxTextureSize)
-       return GL_INVALID_VALUE;
- 
--   if ((height < 1 || height > maxTextureSize)
-+   if ((height < 0 || height > maxTextureSize)
-        && dimensions > 1)
-       return GL_INVALID_VALUE;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/testing/miro/PKGBUILD b/testing/miro/PKGBUILD
deleted file mode 100644
index 10503857b..000000000
--- a/testing/miro/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168842 2012-10-16 11:53:52Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=5.0.4
-pkgrel=2
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
-         'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info'
-         'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
-         'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' 
-         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
-makedepends=('pkg-config' 'boost')
-install=miro.install
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
-        'ffmpeg.patch')
-sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
-          'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cd linux
-  patch -p2 -i "${srcdir}"/ffmpeg.patch
-
-  python2 setup.py install --root="${pkgdir}"
-
-  # fix miro startup script so --debug works with python2
-  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
-  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-
-  # fix python scripts for python2
-  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py
-  for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \
-    usr/share/miro/resources/testdata/7digital-replies/generate.py; do
-    sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} 
-  done
-
-  # Fakeroot segfaults on these; remove
-  if [ ${CARCH} == "i686" ]; then
-    rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true
-  else
-    rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true
-  fi
-}
diff --git a/testing/miro/ffmpeg.patch b/testing/miro/ffmpeg.patch
deleted file mode 100644
index 99c14107d..000000000
--- a/testing/miro/ffmpeg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- miro-5.0.1/linux/miro-segmenter.c~	2012-07-06 14:33:24.618082171 +0000
-+++ miro-5.0.1/linux/miro-segmenter.c	2012-07-06 15:10:19.564146117 +0000
-@@ -156,7 +156,7 @@
-         exit(1);
-     }
- 
--    ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
-+    ret = avformat_open_input(&ic, input, ifmt, 0);
-     if (ret != 0) {
-         fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret);
-         exit(1);
-@@ -215,12 +215,7 @@
-         }
-     }
- 
--    if (av_set_parameters(oc, NULL) < 0) {
--        fprintf(stderr, "Invalid output format parameters\n");
--        exit(1);
--    }
--
--    dump_format(oc, 0, input, 1);
-+    av_dump_format(oc, 0, input, 1);
- 
-     if (video_st) {
-         codec = avcodec_find_decoder(video_st->codec->codec_id);
-@@ -233,12 +228,12 @@
-         }
-     }
- 
--    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+    if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-         fprintf(stderr, "Could not open '%s'\n", output_filename);
-         exit(1);
-     }
- 
--    if (av_write_header(oc)) {
-+    if (avformat_write_header(oc, NULL)) {
-         fprintf(stderr, "Could not write mpegts header to first output file\n");
- 
-         exit(1);
-@@ -274,10 +269,10 @@
-         }
- 
-         if (segment_time - prev_segment_time >= segment_duration) {
--            put_flush_packet(oc->pb);
--            url_fclose(oc->pb);
-+            avio_flush(oc->pb);
-+            avio_close(oc->pb);
- 
--            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+            if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-                 fprintf(stderr, "Could not open '%s'\n", output_filename);
-                 break;
-             }
-@@ -307,7 +302,7 @@
-         av_freep(&oc->streams[i]);
-     }
- 
--    url_fclose(oc->pb);
-+    avio_close(oc->pb);
-     av_free(oc);
- 
-     /* End-of-transcode marker. */
diff --git a/testing/miro/miro.install b/testing/miro/miro.install
deleted file mode 100644
index a5ee228aa..000000000
--- a/testing/miro/miro.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-
diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD
deleted file mode 100644
index 3c284fe79..000000000
--- a/testing/mkinitcpio-busybox/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 166916 2012-09-22 00:40:47Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=mkinitcpio-busybox
-pkgver=1.20.2
-pkgrel=1
-pkgdesc="base initramfs tools"
-arch=('i686' 'x86_64')
-url="http://www.busybox.net/"
-license=('GPL')
-depends=('glibc')
-options=('!buildflags')
-source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
-        'glibc-2.16.patch'
-        'config')
-sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882'
-            'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d'
-            'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0')
-
-build() {
-  cd "$srcdir/busybox-$pkgver"
-
-  local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
-
-  sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
-    "$srcdir/config" > .config
-
-  patch -Np1 < "$srcdir/glibc-2.16.patch"
-
-  make
-}
-
-package() {
-  install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config
deleted file mode 100644
index ed84c5383..000000000
--- a/testing/mkinitcpio-busybox/config
+++ /dev/null
@@ -1,1020 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.20.0
-# Sun May 13 11:33:40 2012
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=63
-CONFIG_LAST_SUPPORTED_WCHAR=767
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
-CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-# CONFIG_FEATURE_SYSTEMD is not set
-# CONFIG_FEATURE_RTMINMAX is not set
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SMALL=0
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_USE_TERMIOS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
-# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-# CONFIG_FEATURE_HWIB is not set
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_XZ is not set
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-CONFIG_FEATURE_SEAMLESS_GZ=y
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-# CONFIG_FEATURE_AR_CREATE is not set
-# CONFIG_BUNZIP2 is not set
-# CONFIG_BZIP2 is not set
-# CONFIG_CPIO is not set
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-# CONFIG_GUNZIP is not set
-# CONFIG_GZIP is not set
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
-CONFIG_GZIP_FAST=0
-# CONFIG_LZOP is not set
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-# CONFIG_TAR is not set
-# CONFIG_FEATURE_TAR_CREATE is not set
-# CONFIG_FEATURE_TAR_AUTODETECT is not set
-# CONFIG_FEATURE_TAR_FROM is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_FEATURE_TAR_TO_COMMAND is not set
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-# CONFIG_UNXZ is not set
-# CONFIG_XZ is not set
-# CONFIG_UNZIP is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-# CONFIG_FEATURE_DATE_NANO is not set
-# CONFIG_FEATURE_DATE_COMPAT is not set
-# CONFIG_HOSTID is not set
-# CONFIG_ID is not set
-# CONFIG_GROUPS is not set
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-# CONFIG_FEATURE_TOUCH_SUSV3 is not set
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-# CONFIG_BASE64 is not set
-# CONFIG_WHO is not set
-# CONFIG_USERS is not set
-# CONFIG_CAL is not set
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
-CONFIG_CUT=y
-CONFIG_DD=y
-# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-# CONFIG_FSYNC is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LN=y
-# CONFIG_LOGNAME is not set
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_BIG is not set
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-# CONFIG_STTY is not set
-# CONFIG_SUM is not set
-# CONFIG_SYNC is not set
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-# CONFIG_TEE is not set
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TRUE=y
-# CONFIG_TTY is not set
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHOAMI is not set
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_FGCONSOLE is not set
-CONFIG_CLEAR=y
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-# CONFIG_RESET is not set
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-CONFIG_SETFONT=y
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-# CONFIG_PATCH is not set
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
-# CONFIG_FEATURE_ALLOW_EXEC is not set
-
-#
-# Finding Utilities
-#
-# CONFIG_FIND is not set
-# CONFIG_FEATURE_FIND_PRINT0 is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_MAXDEPTH is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
-# CONFIG_FEATURE_FIND_USER is not set
-# CONFIG_FEATURE_FIND_GROUP is not set
-# CONFIG_FEATURE_FIND_NOT is not set
-# CONFIG_FEATURE_FIND_DEPTH is not set
-# CONFIG_FEATURE_FIND_PAREN is not set
-# CONFIG_FEATURE_FIND_SIZE is not set
-# CONFIG_FEATURE_FIND_PRUNE is not set
-# CONFIG_FEATURE_FIND_DELETE is not set
-# CONFIG_FEATURE_FIND_PATH is not set
-# CONFIG_FEATURE_FIND_REGEX is not set
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-# CONFIG_FEATURE_FIND_LINKS is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
-# CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_INIT=y
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE=""
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_CRYPT is not set
-# CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=0
-CONFIG_LAST_SYSTEM_ID=0
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELUSER is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_LOGIN_SESSION_AS_CHILD is not set
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODINFO is not set
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-CONFIG_DEFAULT_MODULES_DIR=""
-CONFIG_DEFAULT_DEPMOD_FILE=""
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-# CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_LSPCI is not set
-# CONFIG_LSUSB is not set
-# CONFIG_MKSWAP is not set
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-# CONFIG_MORE is not set
-# CONFIG_MOUNT is not set
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-# CONFIG_FEATURE_MOUNT_FLAGS is not set
-# CONFIG_FEATURE_MOUNT_FSTAB is not set
-# CONFIG_PIVOT_ROOT is not set
-# CONFIG_RDATE is not set
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-# CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
-# CONFIG_FEATURE_SWAPON_PRI is not set
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_SETSERIAL is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-# CONFIG_RFKILL is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-# CONFIG_TIME is not set
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NBDCLIENT is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-# CONFIG_NC_110_COMPAT is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_WHOIS is not set
-CONFIG_FEATURE_IPV6=y
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-# CONFIG_ARPING is not set
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-# CONFIG_HOSTNAME is not set
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-# CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH=""
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_TFTP_DEBUG is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_TRACEROUTE6 is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDHCPC6 is not set
-# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_UDHCPC is not set
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
-# CONFIG_UDPSVD is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_LSOF is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_NMETER is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_PSTREE is not set
-# CONFIG_PWDX is not set
-# CONFIG_SMEMCAP is not set
-CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-CONFIG_FREE=y
-# CONFIG_FUSER is not set
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-# CONFIG_KILLALL5 is not set
-CONFIG_PGREP=y
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_FEATURE_PS_LONG=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-# CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-# CONFIG_WATCH is not set
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-CONFIG_ASH_EXPAND_PRMT=y
-CONFIG_CTTYHACK=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_HISTFILESIZE is not set
-
-#
-# System Logging Utilities
-#
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
-# CONFIG_LOGGER is not set
diff --git a/testing/mkinitcpio-busybox/glibc-2.16.patch b/testing/mkinitcpio-busybox/glibc-2.16.patch
deleted file mode 100644
index 5e2fb4fa5..000000000
--- a/testing/mkinitcpio-busybox/glibc-2.16.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/libbb.h.orig	2012-09-17 08:28:35.215518120 -0400
-+++ b/include/libbb.h	2012-09-17 08:28:49.807212925 -0400
-@@ -44,6 +44,7 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- #ifndef major
- # include <sys/sysmacros.h>
- #endif
diff --git a/testing/mkvtoolnix/PKGBUILD b/testing/mkvtoolnix/PKGBUILD
deleted file mode 100644
index d8ac0b1f7..000000000
--- a/testing/mkvtoolnix/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 163553 2012-07-15 13:17:22Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: xduugu <xduugu@gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.7.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
-             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('99ea44be570412dadafe4ccaee0cfe6e')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Disable automagic curl dep used for online update checking
-  sed -i -e '/curl/d' configure.in
-  export CURL_CFLAGS="" CURL_LIBS=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
-  rake
-
-  mv src/mkvinfo{,-cli}
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  rake
-}
-
-package_mkvtoolnix-cli() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
-  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkvinfo
-  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
-  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
-  rm -rf "${pkgdir}"/usr/share/doc
-  rm -rf "${pkgdir}"/usr/share/locale
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}
diff --git a/testing/mkvtoolnix/mkvtoolnix.install b/testing/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 74d9eb2ef..000000000
--- a/testing/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}
diff --git a/testing/mlocate/PKGBUILD b/testing/mlocate/PKGBUILD
deleted file mode 100644
index d4d79debd..000000000
--- a/testing/mlocate/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 166923 2012-09-22 09:15:37Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: lydgate
-
-pkgname=mlocate
-pkgver=0.26
-pkgrel=1
-pkgdesc='Merging locate/updatedb implementation'
-url='https://fedorahosted.org/mlocate/'
-arch=('i686' 'x86_64')
-license=('GPL')
-backup=('etc/updatedb.conf'
-        'etc/cron.daily/updatedb')
-source=("https://fedorahosted.org/releases/m/l/mlocate/mlocate-${pkgver}.tar.xz"
-	'updatedb.conf'
-	'updatedb.cron')
-sha1sums=('c6e6d81b25359c51c545f4b8ba0f3b469227fcbc'
-          '0150379149bf9d714bc81332d775fc273e7e3535'
-          '8301e6277d27db539af6cf4bc243e8e247bffc2e')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i '/^groupname /s/mlocate/locate/' Makefile.in
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	chgrp 21 "${pkgdir}/usr/bin/locate"
-	chmod 2755 "${pkgdir}/usr/bin/locate"
-	ln -s locate "${pkgdir}/usr/bin/slocate"
-
-	install -dm755 "${pkgdir}/var/lib"
-	install -dm750 -g21 "${pkgdir}/var/lib/locate"
-	
-	install -Dm644 ../updatedb.conf "${pkgdir}/etc/updatedb.conf"
-	install -Dm744 ../updatedb.cron "${pkgdir}/etc/cron.daily/updatedb"
-}
diff --git a/testing/mlocate/updatedb.conf b/testing/mlocate/updatedb.conf
deleted file mode 100644
index 633c17482..000000000
--- a/testing/mlocate/updatedb.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-PRUNE_BIND_MOUNTS = "yes"
-PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset cramfs debugfs devpts devtmpfs ecryptfs exofs ftpfs fuse fuse.encfs fuse.sshfs fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs sshfs sysfs tmpfs ubifs udf usbfs vboxsf"
-PRUNENAMES = ".git .hg .svn"
-PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache /var/lib/pacman/local /var/lock /var/run /var/spool /var/tmp"
diff --git a/testing/mlocate/updatedb.cron b/testing/mlocate/updatedb.cron
deleted file mode 100755
index 431cb533e..000000000
--- a/testing/mlocate/updatedb.cron
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-NICE='nice -n 19'
-IONICE='ionice -c 2 -n 7'
-
-exec ${IONICE} ${NICE} updatedb -f proc
diff --git a/testing/mlocate/updatedb.cron.daily b/testing/mlocate/updatedb.cron.daily
deleted file mode 100755
index cac9bb063..000000000
--- a/testing/mlocate/updatedb.cron.daily
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEDB="/usr/bin/updatedb"
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}"
-fi
-
-# Update the "locate" database
-if [ -x /usr/bin/updatedb ]; then
-  if [ -f /etc/updatedb.conf ]; then
-    ${UPDATEDB}
-  else
-    ${UPDATEDB} -f proc
-  fi
-fi
diff --git a/testing/moc/PKGBUILD b/testing/moc/PKGBUILD
deleted file mode 100644
index 13d711cc9..000000000
--- a/testing/moc/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 163063 2012-07-06 15:21:51Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=moc
-pkgver=20120224
-pkgrel=2
-pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
-arch=('i686' 'x86_64')
-url="http://moc.daper.net/"
-license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
-makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
-optdepends=('speex: for using the speex plugin' 
-	    'ffmpeg: for using the ffmpeg plugin'
-	    'taglib: for using the musepack plugin' 
-	    'libmpcdec: for using the musepack plugin' 
-            'wavpack: for using the wavpack plugin' 
-	    'libmodplug: for using the modplug plugin')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz{,.sig})
-sha1sums=('8ad3521d99fe6f2514907088c70e50c84ec09b46'
-          'e8b2396d99692b0c4f85971d3fa6f5aecb1eb9d3')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=2412
-  _svntrunk="svn://daper.net/moc/trunk"
-  _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
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-# Disabling aac to use the external ffmpeg to play them (FS#13164)
-  autoreconf -i
-  ./configure --prefix=/usr --without-rcc --without-aac \
-    --with-oss  --with-alsa  --with-jack --with-mp3 \
-    --with-musepack --with-vorbis --with-flac --with-wavpack \
-    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
-    --with-samplerate --with-curl --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mod_wsgi/PKGBUILD b/testing/mod_wsgi/PKGBUILD
deleted file mode 100644
index 24c2d0767..000000000
--- a/testing/mod_wsgi/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 168687 2012-10-14 04:16:02Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Ryan Coyner <rcoyner@gmail.com>
-
-pkgname=mod_wsgi
-pkgver=3.4
-pkgrel=1
-pkgdesc="Python WSGI adapter module for Apache"
-arch=('i686' 'x86_64')
-url="http://www.modwsgi.org/"
-license=('APACHE')
-depends=('apache' 'python2')
-install=mod_wsgi.install
-source=("http://modwsgi.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f42d69190ea0c337ef259cbe8d94d985')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-apxs=/usr/sbin/apxs \
-    --with-python=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mod_wsgi/mod_wsgi.install b/testing/mod_wsgi/mod_wsgi.install
deleted file mode 100644
index d26d61631..000000000
--- a/testing/mod_wsgi/mod_wsgi.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-/bin/cat << ENDOFMESSAGE
-==>
-==>
-==>  To install mod_wsgi, add the following line in 
-==>  /etc/httpd/conf/httpd.conf file :
-==>
-==>  LoadModule wsgi_module modules/mod_wsgi.so
-==>
-==>  and restart/reload Apache.
-==>
-==>
-ENDOFMESSAGE
-}
diff --git a/testing/modemmanager/PKGBUILD b/testing/modemmanager/PKGBUILD
deleted file mode 100644
index 8ec1d2f81..000000000
--- a/testing/modemmanager/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165839 2012-08-31 20:12:30Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=modemmanager
-_realname=ModemManager
-pkgver=0.6.0.0
-pkgrel=1
-pkgdesc="Mobile broadband modem management service"
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-license=('GPL2')
-depends=('dbus-glib' 'udev' 'ppp')
-makedepends=('intltool')
-optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz
-        modem-manager.service)
-sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2'
-            '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe')
-
-build() {
-  cd "$_realname-$pkgver"
-   ./configure --prefix=/usr \
-   	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--with-udev-base-dir=/usr/lib/udev \
-	--disable-static
-  make
-}
-
-package() {
-  cd "$_realname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/modem-manager.service" \
-    "$pkgdir/usr/lib/systemd/system/modem-manager.service"
-  echo "SystemdService=modem-manager.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service"
-}
diff --git a/testing/modemmanager/modem-manager.service b/testing/modemmanager/modem-manager.service
deleted file mode 100644
index bad666be8..000000000
--- a/testing/modemmanager/modem-manager.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Modem Manager
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.ModemManager
-ExecStart=/usr/sbin/modem-manager
-# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog()
-# with LOG_PERROR. But systemd redirects stderr to syslog by default, which
-# results in logging each message twice.
-StandardError=null
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/mono/PKGBUILD b/testing/mono/PKGBUILD
deleted file mode 100644
index 742e6053b..000000000
--- a/testing/mono/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 168257 2012-10-06 23:53:27Z tomegun $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Brice Carpentier <brice@dlfp.org>
-
-pkgname=mono
-pkgver=2.10.8
-pkgrel=2
-pkgdesc="Free implementation of the .NET platform including runtime and compiler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
-url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=2.10' 'sh')
-makedepends=('pkgconfig')
-options=('!libtool' '!makeflags')
-provides=('monodoc')
-conflicts=('monodoc')
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        mono.binfmt.d)
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # build mono
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --with-libgdiplus=installed 
-  make || return 1
-
-  # build jay
-  cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-
-  # install jay
-  cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay
-  make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # install binfmt conf file and pathes
-  install -D -m644 ${srcdir}/mono.binfmt.d ${pkgdir}/usr/lib/binfmt.d/mono.conf
-
-  #install license
-  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 mcs/MIT.X11 ${pkgdir}/usr/share/licenses/${pkgname}/
-  
-  #fix .pc file to be able to request mono on what it depends, fixes #go-oo build
-  sed -i -e "s:#Requires:Requires:" ${pkgdir}/usr/lib/pkgconfig/mono.pc
-}
-md5sums=('411a2d9bcfc37a61eb9aedba88b40533'
-         'b9ef8a65fea497acf176cca16c1e2402')
diff --git a/testing/mono/bug434892.patch b/testing/mono/bug434892.patch
deleted file mode 100644
index d4f46f68c..000000000
--- a/testing/mono/bug434892.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/07/01 20:17:46	107006
-+++ trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/10/28 09:32:46	117243
-@@ -177,7 +177,7 @@
- 				foreach (OperationMessage om in op.Messages) {
- 					Message msg = ctx.Services.GetMessage (om.Message);
- 					foreach (MessagePart part in msg.Parts)
--						parts.Add (part,part);
-+						parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
- 				}
- 			}
- 			
diff --git a/testing/mono/mini_amd64.patch b/testing/mono/mini_amd64.patch
deleted file mode 100644
index f8685c337..000000000
--- a/testing/mono/mini_amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mono/mini/mini-amd64.c	2009-03-19 21:08:18 UTC (rev 129824)
-+++ mono/mini/mini-amd64.c	2009-03-19 21:09:53 UTC (rev 129825)
-@@ -1009,7 +1009,7 @@
- 		locals_size += mono_type_size (ins->inst_vtype, &ialign);
- 	}
- 
--	if ((cfg->num_varinfo > 10000) || (locals_size >= (1 << 15))) {
-+	if ((cfg->num_varinfo > 5000) || (locals_size >= (1 << 15)) || (header->code_size > 110000)) {
- 		/* Avoid hitting the stack_alloc_size < (1 << 16) assertion in emit_epilog () */
- 		cfg->arch.omit_fp = FALSE;
- 	}
-
- 			
diff --git a/testing/mono/mono.binfmt.d b/testing/mono/mono.binfmt.d
deleted file mode 100644
index 3075b0dc5..000000000
--- a/testing/mono/mono.binfmt.d
+++ /dev/null
@@ -1 +0,0 @@
-:CLR:M::MZ::/usr/bin/mono:
diff --git a/testing/monodevelop-debugger-gdb/PKGBUILD b/testing/monodevelop-debugger-gdb/PKGBUILD
deleted file mode 100644
index 3a639b826..000000000
--- a/testing/monodevelop-debugger-gdb/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164745 2012-08-04 11:23:57Z andyrtr $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=monodevelop-debugger-gdb
-pkgver=3.0.3.5
-pkgrel=1
-pkgdesc="Mono Debugger support"
-arch=('i686' 'x86_64') # also "any" pkg?
-url="http://monodevelop.com"
-license=('GPL')
-depends=('monodevelop>=3.0.3.5-2' 'gdb')
-makedepends=('mono')
-options=('!makeflags')
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('c16da5cdbda46fb32e0dc730bb433203')
-
-build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-  
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/monodevelop/PKGBUILD b/testing/monodevelop/PKGBUILD
deleted file mode 100644
index 1371e34d8..000000000
--- a/testing/monodevelop/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 164744 2012-08-04 11:23:54Z andyrtr $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=monodevelop
-pkgver=3.0.3.5
-pkgrel=2
-pkgdesc="An IDE primarily designed for C# and other .NET languages"
-
-# should probably changed to "any" - no ELF files - OpenSUSE builds it as NOARCH 
-arch=('i686' 'x86_64')
-
-url="http://www.monodevelop.com"
-license=('GPL')
-depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme')
-options=(!makeflags)
-install=monodevelop.install
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        monodevelop-core-addins.pc.in.patch)
-md5sums=('ca46b77b49266112b63a8f5c451c5565'
-         '8466d032735130e37d4091a793a7966c')
-
-build() {
-  export MONO_SHARED_DIR=$srcdir/src/.wabi
-  mkdir -p $MONO_SHARED_DIR
-
-  cd $srcdir/$pkgname-$pkgver
-  # fix location for MonoDevelop.Gettext.dll - breaks gdb build
-  patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch
-  
-  ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb
-  LD_PRELOAD="" make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  LD_PRELOAD="" make DESTDIR=$pkgdir install
-  rm -r $MONO_SHARED_DIR
-}
-
diff --git a/testing/monodevelop/monodevelop-core-addins.pc.in.patch b/testing/monodevelop/monodevelop-core-addins.pc.in.patch
deleted file mode 100644
index c1da3bf1f..000000000
--- a/testing/monodevelop/monodevelop-core-addins.pc.in.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- monodevelop-core-addins.pc.in	2012-07-27 21:33:41.000000000 +0200
-+++ monodevelop-core-addins.pc.in.new	2012-08-04 12:42:36.086516667 +0200
-@@ -6,4 +6,4 @@
- Name: MonoDevelop Core Add-ins
- Description: MonoDevelop Core Add-ins
- Version: @VERSION@
--Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
-+Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
diff --git a/testing/monodevelop/monodevelop.install b/testing/monodevelop/monodevelop.install
deleted file mode 100644
index 070e6202c..000000000
--- a/testing/monodevelop/monodevelop.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  update-mime-database /usr/share/mime 1> /dev/null
-  echo "update desktop mime database..."
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  update-mime-database /usr/share/mime 1> /dev/null
-  echo "update desktop mime database..."
-  update-desktop-database -q
-}
diff --git a/testing/mousetweaks/PKGBUILD b/testing/mousetweaks/PKGBUILD
deleted file mode 100644
index 4dddd4cb5..000000000
--- a/testing/mousetweaks/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> 
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=mousetweaks
-pkgver=3.6.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=('2c48f655c5b53615270503fd1631e0cf7baa5872b20f75af8608983f039c5cfc')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mousetweaks/mousetweaks.install b/testing/mousetweaks/mousetweaks.install
deleted file mode 100644
index 1ae919322..000000000
--- a/testing/mousetweaks/mousetweaks.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall mousetweaks
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD
deleted file mode 100644
index 0d0222580..000000000
--- a/testing/mpd/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 163064 2012-07-06 15:22:01Z ibiru $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.17
-pkgrel=2
-pkgdesc='Flexible, powerful, server-side application for playing music'
-url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
-makedepends=('doxygen')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'tmpfiles.d'
-        'rc.d') 
-sha1sums=('36201f32ca5729b62b0e6cbddb19ade20ee3f7d7'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
-          '3470d489565f0ed479f1665dd2876f66acb5a585')
-
-backup=('etc/mpd.conf')
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-lastfm \
-		--enable-jack \
-		--enable-pulse \
-		--enable-documentation \
-		--disable-libwrap \
-		--disable-cue \
-		--disable-sidplay \
-		--disable-documentation \
-		--with-systemdsystemunitdir=/usr/lib/systemd/system
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i doc/mpdconf.example
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
-}
diff --git a/testing/mpd/install b/testing/mpd/install
deleted file mode 100644
index 261b8fd0d..000000000
--- a/testing/mpd/install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null
-	getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null
-	true
-}
-
-post_remove() {
-	getent passwd mpd &>/dev/null && userdel mpd >/dev/null
-	getent group mpd &>/dev/null && groupdel mpd >/dev/null
-	true
-}
diff --git a/testing/mpd/rc.d b/testing/mpd/rc.d
deleted file mode 100755
index f00e16067..000000000
--- a/testing/mpd/rc.d
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy 'Starting Music Player Daemon'
-		/usr/bin/mpd /etc/mpd.conf &> /dev/null &&
-		{ add_daemon mpd; stat_done; } || stat_fail
-		;;
-	stop)
-		stat_busy 'Stopping Music Player Daemon'
-		/usr/bin/mpd --kill /etc/mpd.conf &> /dev/null &&
-		{ rm_daemon mpd; stat_done; } || stat_fail
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mpd/tmpfiles.d b/testing/mpd/tmpfiles.d
deleted file mode 100644
index 41c4e743a..000000000
--- a/testing/mpd/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mpd 0755 mpd mpd
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
deleted file mode 100644
index 44e679f75..000000000
--- a/testing/mpfr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 165793 2012-08-30 12:11:01Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=mpfr
-_pkgver=3.1.1
-_patchlevel=p2
-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{,.asc}
-	mpfr-${_pkgver}-${_patchlevel}.patch)
-md5sums=('91d51c41fcf2799e4ee7a7126fc95c17'
-         '91b187a2229211e543ba6fb82a079b2c'
-         'eef835f97bc26ea20b0232bd913acdd8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  ./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.p10.patch b/testing/mpfr/mpfr-3.1.0.p10.patch
deleted file mode 100644
index 0073be709..000000000
--- a/testing/mpfr/mpfr-3.1.0.p10.patch
+++ /dev/null
@@ -1,1896 +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 -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
-@@ -0,0 +1 @@
-+lib-search-path
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p1
-+3.1.0-p2
-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-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.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-p1"
-+#define MPFR_VERSION_STRING "3.1.0-p2"
- 
- /* 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-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p1";
-+  return "3.1.0-p2";
- }
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
---- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-@@ -65,8 +65,24 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
---- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-@@ -1124,11 +1124,27 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
- all: all-am
- 
- .SUFFIXES:
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p2
-+3.1.0-p3
-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-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.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-p2"
-+#define MPFR_VERSION_STRING "3.1.0-p3"
- 
- /* 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/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
---- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -1178,7 +1178,7 @@
-   mpfr_exp_t exp;
-   char * str;
-   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
--  const int keep_trailing_zeros = spec_g && spec.alt;
-+  const int keep_trailing_zeros = !spec_g || spec.alt;
- 
-   /* WARNING: an empty precision field is forbidden (it means precision = 6
-      and it should have been changed to 6 before the function call) */
-@@ -1356,7 +1356,7 @@
-   else
-     /* 1 <= |p| */
-     {
--      size_t nsd;  /* Number of significant digits */
-+      size_t str_len;
- 
-       /* Determine the position of the most significant decimal digit. */
-       exp = floor_log10 (p);
-@@ -1365,12 +1365,10 @@
-         /* P is too large to print all its integral part digits */
-         return -1;
- 
--      np->ip_size = exp + 1;
--
--      nsd = spec.prec + np->ip_size;
-       if (dec_info == NULL)
--        {
--          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
-+        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
-+          str =
-+            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
-           register_string (np->sl, str);
-         }
-       else
-@@ -1379,81 +1377,60 @@
-           str = dec_info->str;
-         }
-       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
-+      str_len = strlen (str);
-+
-+      /* integral part */
-+      if (exp > str_len)
-+        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
-+           power of 10 (p integer, so no fractional part) */
-+        {
-+          np->ip_trailing_zeros = exp - str_len;
-+          np->ip_size = str_len;
-+        }
-+      else
-+        np->ip_size = exp;
- 
-       if (spec.group)
-         /* thousands separator in integral part */
-         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
- 
--      if (nsd == 0 || (spec_g && !spec.alt))
--        /* compute how much non-zero digits in integral and fractional
--           parts */
-+      /* fractional part */
-+      str += np->ip_size;
-+      str_len -= np->ip_size;
-+      if (!keep_trailing_zeros)
-+        /* remove trailing zeros, if any */
-         {
--          size_t str_len;
--          str_len = strlen (str); /* note: the sign has been skipped */
--
--          if (exp > str_len)
--            /* mpfr_get_str doesn't give the trailing zeros when p is a
--               multiple of 10 (p integer, so no fractional part) */
--            {
--              np->ip_trailing_zeros = exp - str_len;
--              np->ip_size = str_len;
--              if (spec.alt)
--                np->point = MPFR_DECIMAL_POINT;
--            }
--          else
--            /* str may contain some digits which are in fractional part */
-+          char *ptr = str + str_len - 1; /* pointer to the last digit of
-+                                            str */
-+          while ((*ptr == '0') && (str_len != 0))
-             {
--              char *ptr;
--
--              ptr = str + str_len - 1; /* points to the end of str */
--              str_len -= np->ip_size;  /* number of digits in fractional
--                                          part */
--
--              if (!keep_trailing_zeros)
--                /* remove trailing zeros, if any */
--                {
--                  while ((*ptr == '0') && (str_len != 0))
--                    {
--                      --ptr;
--                      --str_len;
--                    }
--                }
--
--              if (str_len > INT_MAX)
--                /* too many digits in fractional part */
--                return -1;
--
--              if (str_len != 0)
--                /* some digits in fractional part */
--                {
--                  np->point = MPFR_DECIMAL_POINT;
--                  np->fp_ptr = str + np->ip_size;
--                  np->fp_size = str_len;
--                }
-+              --ptr;
-+              --str_len;
-             }
-         }
--      else
--        /* spec.prec digits in fractional part */
-+
-+      if (str_len > 0)
-+        /* some nonzero digits in fractional part */
-         {
--          if (np->ip_size == exp - 1)
--            /* the absolute value of the number has been rounded up to a power
--               of ten.
--               Insert an additional zero in integral part and put the rest of
--               them in fractional part. */
--            np->ip_trailing_zeros = 1;
-+          if (str_len > INT_MAX)
-+            /* too many digits in fractional part */
-+            return -1;
- 
--          if (spec.prec != 0)
--            {
--              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
--              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_ptr = str;
-+          np->fp_size = str_len;
-+        }
- 
--              np->point = MPFR_DECIMAL_POINT;
--              np->fp_ptr = str + np->ip_size;
--              np->fp_size = spec.prec;
--            }
--          else if (spec.alt)
--            np->point = MPFR_DECIMAL_POINT;
-+      if (keep_trailing_zeros && str_len < spec.prec)
-+        /* add missing trailing zeros */
-+        {
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_trailing_zeros = spec.prec - np->fp_size;
-         }
-+
-+      if (spec.alt)
-+        /* add decimal point even if no digits follow it */
-+        np->point = MPFR_DECIMAL_POINT;
-     }
- 
-   return 0;
-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-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p2";
-+  return "3.1.0-p3";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
---- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -475,6 +475,18 @@
-   check_sprintf ("-1.", "%- #0.1RG", x);
- 
-   /* precision zero */
-+  mpfr_set_d (x, 9.5, MPFR_RNDN);
-+  check_sprintf ("9",    "%.0RDf", x);
-+  check_sprintf ("10",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 19.5, MPFR_RNDN);
-+  check_sprintf ("19",    "%.0RDf", x);
-+  check_sprintf ("20",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 99.5, MPFR_RNDN);
-+  check_sprintf ("99",    "%.0RDf", x);
-+  check_sprintf ("100",   "%.0RUf", x);
-+
-   mpfr_set_d (x, -9.5, MPFR_RNDN);
-   check_sprintf ("-10",    "%.0RDf", x);
-   check_sprintf ("-10",    "%.0RYf", x);
-@@ -1078,6 +1090,23 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+bug20111102 (void)
-+{
-+  mpfr_t t;
-+  char s[100];
-+
-+  mpfr_init2 (t, 84);
-+  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
-+  mpfr_sprintf (s, "%.20RNg", t);
-+  if (strcmp (s, "1000") != 0)
-+    {
-+      printf ("Error in bug20111102, expected 1000, got %s\n", s);
-+      exit (1);
-+    }
-+  mpfr_clear (t);
-+}
-+
- /* In particular, the following test makes sure that the rounding
-  * for %Ra and %Rb is not done on the MPFR number itself (as it
-  * would overflow). Note: it has been reported on comp.std.c that
-@@ -1161,6 +1190,7 @@
-   locale = setlocale (LC_ALL, "C");
- #endif
- 
-+  bug20111102 ();
-   native_types ();
-   hexadecimal ();
-   binary ();
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-28 12:22:52.000000000 +0000
-@@ -0,0 +1 @@
-+gmp41compat
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-28 12:22:52.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p3
-+3.1.0-p4
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
---- mpfr-3.1.0-a/doc/mpfr.info	2011-10-03 09:43:04.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.info	2011-11-28 12:22:52.000000000 +0000
-@@ -2994,11 +2994,12 @@
- 
-    * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1.  Their
-      behavior no longer depends on the platform (assuming this is also
--     true for GMP's random generator).  As a consequence, the returned
--     values can be different between MPFR 3.1 and previous MPFR
--     versions.  Note: as the reproducibility of these functions was not
--     specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
--     as backward incompatible with previous versions.
-+     true for GMP's random generator, which is not the case between GMP
-+     4.1 and 4.2 if `gmp_randinit_default' is used).  As a consequence,
-+     the returned values can be different between MPFR 3.1 and previous
-+     MPFR versions.  Note: as the reproducibility of these functions
-+     was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
-+     regarded as backward incompatible with previous versions.
- 
- 
- 
-@@ -4239,13 +4240,13 @@
- Node: Type and Macro Changes129308
- Node: Added Functions132029
- Node: Changed Functions134972
--Node: Removed Functions139167
--Node: Other Changes139579
--Node: Contributors141108
--Node: References143574
--Node: GNU Free Documentation License145315
--Node: Concept Index167758
--Node: Function and Type Index173677
-+Node: Removed Functions139253
-+Node: Other Changes139665
-+Node: Contributors141194
-+Node: References143660
-+Node: GNU Free Documentation License145401
-+Node: Concept Index167844
-+Node: Function and Type Index173763
- 
- End Tag Table
- 
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
---- mpfr-3.1.0-a/doc/mpfr.texi	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.texi	2011-11-28 12:22:52.000000000 +0000
-@@ -3466,8 +3466,9 @@
- a lack of specification.
- 
- @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
--Their behavior no longer depends on the platform (assuming this is also
--true for GMP's random generator).  As a consequence, the returned values
-+Their behavior no longer depends on the platform (assuming this is also true
-+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
-+@code{gmp_randinit_default} is used).  As a consequence, the returned values
- can be different between MPFR 3.1 and previous MPFR versions.
- Note: as the reproducibility of these functions was not specified
- before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
-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-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-28 12:22:52.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-p3"
-+#define MPFR_VERSION_STRING "3.1.0-p4"
- 
- /* 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-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-28 12:22:52.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p3";
-+  return "3.1.0-p4";
- }
-diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
---- mpfr-3.1.0-a/tests/trandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/trandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -114,21 +114,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.895943"
-+# define C2 "0.848824"
-+#else
-+# define C1 "0.479652"
-+# define C2 "0.648529"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.895943") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.895943, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.848824") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.848824, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
---- mpfr-3.1.0-a/tests/turandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/turandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -160,23 +160,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.8488312"
-+# define C2 "0.8156509"
-+#else
-+# define C1 "0.6485367"
-+# define C2 "0.9362717"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandom (x, s, MPFR_RNDN);
--  /* the following values are obtained on a 32-bit computer, we should get
--     the same values on a 64-bit computer */
--  if (mpfr_cmp_str1 (x, "0.8488312") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8488312, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandom (x, s, MPFR_RNDN);
--  if (mpfr_cmp_str1 (x, "0.8156509") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8156509, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 12:44:49.000000000 +0000
-@@ -0,0 +1 @@
-+logging-freeze
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 12:44:49.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p4
-+3.1.0-p5
-diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
---- mpfr-3.1.0-a/src/add_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
---- mpfr-3.1.0-a/src/add_ui.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_ui.c	2012-02-24 12:44:49.000000000 +0000
-@@ -29,7 +29,7 @@
-   MPFR_LOG_FUNC
-     (("x[%Pu]=%.*Rg u=%d rnd=%d",
-       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
--     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
-+     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
- 
-   if (MPFR_LIKELY(u != 0) )  /* if u=0, do nothing */
-     {
-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-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 12:44:49.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-p4"
-+#define MPFR_VERSION_STRING "3.1.0-p5"
- 
- /* 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/mul_d.c mpfr-3.1.0-b/src/mul_d.c
---- mpfr-3.1.0-a/src/mul_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-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-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 12:44:49.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p4";
-+  return "3.1.0-p5";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 13:50:05.000000000 +0000
-@@ -0,0 +1 @@
-+logging-varfmt
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 13:50:05.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p5
-+3.1.0-p6
-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-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-@@ -1592,7 +1592,7 @@
-   do                                                                    \
-     if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) &&                        \
-         (mpfr_log_current <= mpfr_log_level))                           \
--      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__,          \
-+      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__,          \
-                  #x, mpfr_get_prec (x), mpfr_log_prec, x);              \
-   while (0)
- 
-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	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 13:50:05.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-p5"
-+#define MPFR_VERSION_STRING "3.1.0-p6"
- 
- /* 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	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 13:50:05.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p5";
-+  return "3.1.0-p6";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-03-08 15:17:03.000000000 +0000
-@@ -0,0 +1 @@
-+large-prec
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-03-08 15:17:03.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p6
-+3.1.0-p7
-diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c
---- mpfr-3.1.0-a/src/add1.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1.c	2012-03-08 15:17:03.000000000 +0000
-@@ -44,12 +44,12 @@
-   bq = MPFR_PREC(b);
-   cq = MPFR_PREC(c);
- 
--  an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */
-+  an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */
-   aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS;
-   sh = aq2 - aq;                  /* non-significant bits in low limb */
- 
--  bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */
--  cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
- 
-   ap = MPFR_MANT(a);
-   bp = MPFR_MANT(b);
-@@ -124,7 +124,7 @@
-       dif = aq2 - diff_exp;
-       /* dif is the number of bits of c which overlap with a' */
- 
--      difn = (dif-1)/GMP_NUMB_BITS + 1;
-+      difn = MPFR_PREC2LIMBS (dif);
-       /* only the highest difn limbs from c have to be considered */
-       if (MPFR_UNLIKELY(difn > cn))
-         {
-diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c
---- mpfr-3.1.0-a/src/add1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -107,7 +107,7 @@
- 
-   /* Read prec and num of limbs */
-   p = MPFR_PREC(b);
--  n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS;
-+  n = MPFR_PREC2LIMBS (p);
-   MPFR_UNSIGNED_MINUS_MODULO(sh, p);
-   bx = MPFR_GET_EXP(b);
-   d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c));
-diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c
---- mpfr-3.1.0-a/src/agm.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/agm.c	2012-03-08 15:17:03.000000000 +0000
-@@ -91,7 +91,7 @@
-   q = MPFR_PREC(r);
-   p = q + MPFR_INT_CEIL_LOG2(q) + 15;
-   MPFR_ASSERTD (p >= 7); /* see algorithms.tex */
--  s = (p - 1) / GMP_NUMB_BITS + 1;
-+  s = MPFR_PREC2LIMBS (p);
- 
-   /* b (op2) and a (op1) are the 2 operands but we want b >= a */
-   compare = mpfr_cmp (op1, op2);
-@@ -285,7 +285,7 @@
- 
-       /* Next iteration */
-       MPFR_ZIV_NEXT (loop, p);
--      s = (p - 1) / GMP_NUMB_BITS + 1;
-+      s = MPFR_PREC2LIMBS (p);
-     }
-   MPFR_ZIV_FREE (loop);
- 
-diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c
---- mpfr-3.1.0-a/src/eq.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/eq.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,8 +56,8 @@
-   if (uexp != vexp)
-     return 0; /* no bit agree */
- 
--  usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1;
--  vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1;
-+  usize = MPFR_LIMB_SIZE (u);
-+  vsize = MPFR_LIMB_SIZE (v);
- 
-   if (vsize > usize) /* exchange u and v */
-     {
-diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c
---- mpfr-3.1.0-a/src/exp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/exp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -133,7 +133,7 @@
-               mp_size_t yn;
-               int sh;
- 
--              yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+              yn = MPFR_LIMB_SIZE (y);
-               sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y);
-               MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh;
-               inexact = 1;
-diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c
---- mpfr-3.1.0-a/src/get_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_d.c	2012-03-08 15:17:03.000000000 +0000
-@@ -100,7 +100,7 @@
-           nbits += (1021 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE );
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c
---- mpfr-3.1.0-a/src/get_flt.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_flt.c	2012-03-08 15:17:03.000000000 +0000
-@@ -92,7 +92,7 @@
-           nbits += (125 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT);
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c
---- mpfr-3.1.0-a/src/get_str.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_str.c	2012-03-08 15:17:03.000000000 +0000
-@@ -2351,7 +2351,7 @@
- 
-       /* the first digit will contain only r bits */
-       prec = (m - 1) * pow2 + r; /* total number of bits */
--      n = (prec - 1) / GMP_NUMB_BITS + 1;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       MPFR_TMP_MARK (marker);
-       x1 = MPFR_TMP_LIMBS_ALLOC (n + 1);
-@@ -2417,12 +2417,12 @@
-       exact = 1;
- 
-       /* number of limbs */
--      n = 1 + (prec - 1) / GMP_NUMB_BITS;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       /* a will contain the approximation of the mantissa */
-       a = MPFR_TMP_LIMBS_ALLOC (n);
- 
--      nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+      nx = MPFR_LIMB_SIZE (x);
- 
-       if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or
-                                 division to perform */
-diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c
---- mpfr-3.1.0-a/src/init2.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/init2.c	2012-03-08 15:17:03.000000000 +0000
-@@ -51,7 +51,7 @@
-      which both have an odd mantissa */
-   MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
--  xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
-   tmp   = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize));
- 
-   MPFR_PREC(x) = p;                /* Set prec */
-diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
---- mpfr-3.1.0-a/src/lngamma.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
-@@ -67,7 +67,7 @@
- 
-   /* Now, the unit bit is represented. */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of represented fractional bits (including the trailing 0's) */
- 
-   x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS);
-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	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-03-09 12:06:26.000000000 +0000
-@@ -646,10 +646,24 @@
-  **************** mpfr_t properties *******************
-  ******************************************************/
- 
-+/* In the following macro, p is usually a mpfr_prec_t, but this macro
-+   works with other integer types (without integer overflow). Checking
-+   that p >= 1 in debug mode is useful here because this macro can be
-+   used on a computed precision (in particular, this formula does not
-+   work for a degenerate case p = 0, and could give different results
-+   on different platforms). But let us not use an assertion checking
-+   in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid
-+   too much expansion for assertions (in practice, this should be a
-+   problem just when testing MPFR with the --enable-assert configure
-+   option and the -ansi -pedantic-errors gcc compiler flags). */
-+#define MPFR_PREC2LIMBS(p) \
-+  (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1)
-+
- #define MPFR_PREC(x)      ((x)->_mpfr_prec)
- #define MPFR_EXP(x)       ((x)->_mpfr_exp)
- #define MPFR_MANT(x)      ((x)->_mpfr_d)
--#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1)
-+#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS)
-+#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1)
- 
- 
- /******************************************************
-@@ -749,7 +763,8 @@
- #define MPFR_IS_FP(x)       (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x))
- #define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF)
- #define MPFR_IS_PURE_FP(x)  (!MPFR_IS_SINGULAR(x) && \
--  (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1))
-+  (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)]  \
-+                  & MPFR_LIMB_HIGHBIT) != 0), 1))
- 
- #define MPFR_ARE_SINGULAR(x,y) \
-   (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y)))
-@@ -1061,7 +1076,7 @@
- /* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */
- #define MPFR_SET_ONE(x)                                               \
- do {                                                                  \
--  mp_size_t _size = MPFR_LIMB_SIZE(x) - 1;                            \
-+  mp_size_t _size = MPFR_LAST_LIMB(x);                                \
-   MPFR_SET_POS(x);                                                    \
-   MPFR_EXP(x) = 1;                                                    \
-   MPN_ZERO ( MPFR_MANT(x), _size);                                    \
-@@ -1213,8 +1228,8 @@
-     _destp = MPFR_MANT (dest);                                              \
-     if (MPFR_UNLIKELY (_destprec >= _srcprec))                              \
-       {                                                                     \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs;       \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec) - _srcs;                       \
-         MPN_COPY (_destp + _dests, srcp, _srcs);                            \
-         MPN_ZERO (_destp, _dests);                                          \
-         inexact = 0;                                                        \
-@@ -1227,8 +1242,8 @@
-         mp_limb_t _rb, _sb, _ulp;                                           \
-                                                                             \
-         /* Compute Position and shift */                                    \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec);                               \
-         MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec);                        \
-         _sp = (srcp) + _srcs - _dests;                                      \
-                                                                             \
-@@ -1372,7 +1387,7 @@
-       if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src)))            \
-         {                                                               \
-           MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src),                  \
--                    (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \
-+                    MPFR_LIMB_SIZE (src));                              \
-           inexact = 0;                                                  \
-         }                                                               \
-       else                                                              \
-@@ -1682,7 +1697,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE))            \
-    {                                                                    \
-      (g).alloc = (num) * _size * sizeof (mp_limb_t);                    \
-@@ -1733,7 +1748,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  (g).alloc = (num) * _size * sizeof (mp_limb_t);                        \
-  if (MPFR_LIKELY (_oalloc == 0))                                        \
-    (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc);         \
-@@ -1886,7 +1901,7 @@
-        MPFR_NORETURN_ATTR;
- 
- __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t,
--                                                unsigned long));
-+                                                mpfr_prec_t));
- 
- __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*,
-                                                             unsigned long));
-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	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-03-08 15:17:03.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-p6"
-+#define MPFR_VERSION_STRING "3.1.0-p7"
- 
- /* 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/mul.c mpfr-3.1.0-b/src/mul.c
---- mpfr-3.1.0-a/src/mul.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul.c	2012-03-08 15:17:03.000000000 +0000
-@@ -93,15 +93,15 @@
- 
-   ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c);
- 
--  bq = MPFR_PREC(b);
--  cq = MPFR_PREC(c);
-+  bq = MPFR_PREC (b);
-+  cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   /* <= k, thus no int overflow */
-   MPFR_ASSERTD(tn <= k);
- 
-@@ -292,12 +292,12 @@
-   bq = MPFR_PREC (b);
-   cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
- 
-   /* Check for no size_t overflow*/
-diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c
---- mpfr-3.1.0-a/src/pow.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/pow.c	2012-03-08 15:17:03.000000000 +0000
-@@ -136,7 +136,7 @@
-      (b) all the 'z' bits are zero
-   */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of z+0 bits */
- 
-   yn = prec / GMP_NUMB_BITS;
-diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c
---- mpfr-3.1.0-a/src/print_raw.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/print_raw.c	2012-03-08 15:17:03.000000000 +0000
-@@ -84,7 +84,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   printf("%s ", str);
-   for(n-- ; n>=0 ; n--)
-@@ -109,7 +109,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   for(n-- ; n>=0 ; n--)
-     {
-diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c
---- mpfr-3.1.0-a/src/round_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -55,12 +55,12 @@
- 
-   MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX);
- 
--  nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */
-+  nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */
- 
-   /* check if x has enough allocated space for the significand */
-   /* Get the number of limbs from the precision.
-      (Compatible with all allocation methods) */
--  ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  ow = MPFR_LIMB_SIZE (x);
-   if (nw > ow)
-     {
-       /* FIXME: Variable can't be created using custom allocation,
-diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c
---- mpfr-3.1.0-a/src/round_raw_generic.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_raw_generic.c	2012-03-08 15:17:03.000000000 +0000
-@@ -80,7 +80,7 @@
-       (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg)))
-     return 0;
- 
--  xsize = (xprec-1)/GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (xprec);
-   nw = yprec / GMP_NUMB_BITS;
-   rw = yprec & (GMP_NUMB_BITS - 1);
- 
-diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c
---- mpfr-3.1.0-a/src/set.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set.c	2012-03-08 15:17:03.000000000 +0000
-@@ -48,8 +48,7 @@
-       /* Same precision and b is not singular:
-        * just copy the mantissa, and set the exponent and the sign
-        * The result is exact. */
--      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b),
--                (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS);
-+      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b));
-       MPFR_RET (0);
-     }
-   else
-diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c
---- mpfr-3.1.0-a/src/set_f.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_f.c	2012-03-08 15:17:03.000000000 +0000
-@@ -43,7 +43,7 @@
-   if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0)
-     MPFR_CHANGE_SIGN (y);
- 
--  sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+  sy = MPFR_LIMB_SIZE (y);
-   my = MPFR_MANT(y);
-   mx = PTR(x);
- 
-diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c
---- mpfr-3.1.0-a/src/set_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
-   /* Calculate the new number of limbs */
--  xsize = (p - 1) / GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
- 
-   /* Realloc only if the new size is greater than the old */
-   xoldsize = MPFR_GET_ALLOC_SIZE (x);
-diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c
---- mpfr-3.1.0-a/src/setmax.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/setmax.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   mp_limb_t *xp;
- 
-   MPFR_SET_EXP (x, e);
--  xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+  xn = MPFR_LIMB_SIZE (x);
-   sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x);
-   xp = MPFR_MANT(x);
-   xp[0] = MP_LIMB_T_MAX << sh;
-diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c
---- mpfr-3.1.0-a/src/sqr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sqr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,11 +56,11 @@
-   ax = 2 * MPFR_GET_EXP (b);
-   bq = MPFR_PREC(b);
- 
--  MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX);
- 
--  bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */
--  tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square,
--                                               2*bn or 2*bn-1 */
-+  bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */
-+  tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square,
-+                                    2*bn or 2*bn-1 */
- 
-   if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD))
-     return mpfr_mul (a, b, b, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c
---- mpfr-3.1.0-a/src/stack_interface.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/stack_interface.c	2012-03-08 15:17:03.000000000 +0000
-@@ -26,7 +26,7 @@
- size_t
- mpfr_custom_get_size (mpfr_prec_t prec)
- {
--  return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB;
-+  return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
- }
- 
- #undef mpfr_custom_init
-diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c
---- mpfr-3.1.0-a/src/strtofr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/strtofr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -467,7 +467,7 @@
-       /* Set y to the value of the ~prec most significant bits of pstr->mant
-          (as long as we guarantee correct rounding, we don't need to get
-          exactly prec bits). */
--      ysize = (prec - 1) / GMP_NUMB_BITS + 1;
-+      ysize = MPFR_PREC2LIMBS (prec);
-       /* prec bits corresponds to ysize limbs */
-       ysize_bits = ysize * GMP_NUMB_BITS;
-       /* and to ysize_bits >= prec > MPFR_PREC (x) bits */
-diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c
---- mpfr-3.1.0-a/src/sub1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sub1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -155,8 +155,8 @@
-   MPFR_ASSERTD(MPFR_IS_PURE_FP(c));
- 
-   /* Read prec and num of limbs */
--  p = MPFR_PREC(b);
--  n = (p-1)/GMP_NUMB_BITS+1;
-+  p = MPFR_PREC (b);
-+  n = MPFR_PREC2LIMBS (p);
- 
-   /* Fast cmp of |b| and |c|*/
-   bx = MPFR_GET_EXP (b);
-diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c
---- mpfr-3.1.0-a/src/urandomb.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/urandomb.c	2012-03-08 15:17:03.000000000 +0000
-@@ -31,13 +31,20 @@
-    a sufficient number of limbs */
- void
- mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate,
--               unsigned long int nbits)
-+               mpfr_prec_t nbits)
- {
-   mpz_t z;
- 
-+  MPFR_ASSERTN (nbits >= 1);
-   /* To be sure to avoid the potential allocation of mpz_urandomb */
--  ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1;
-+  ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits);
-   PTR(z)   = mp;
-+#if __MPFR_GMP(5,0,0)
-+  /* Check for integer overflow (unless mp_bitcnt_t is signed,
-+     but according to the GMP manual, this shouldn't happen).
-+     Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */
-+  MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1);
-+#endif
-   mpz_urandomb (z, rstate, nbits);
- }
- 
-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	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-03-08 15:17:03.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p6";
-+  return "3.1.0-p7";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c
---- mpfr-3.1.0-a/tests/tinits.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tinits.c	2012-03-08 15:17:03.000000000 +0000
-@@ -1,4 +1,4 @@
--/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears.
-+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears.
- 
- Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
- Contributed by the Arenaire and Caramel projects, INRIA.
-@@ -20,18 +20,43 @@
- http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
- 
-+#include <stdlib.h>
-+
- #include "mpfr-test.h"
- 
- int
- main (void)
- {
-   mpfr_t a, b, c;
-+  long large_prec;
- 
-   tests_start_mpfr ();
-+
-   mpfr_inits (a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-   mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-+
-+  /* test for precision 2^31-1, see
-+     https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */
-+  large_prec = 2147483647;
-+  if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
-+    {
-+      /* We assume that the precision won't be increased internally. */
-+      if (large_prec > MPFR_PREC_MAX)
-+        large_prec = MPFR_PREC_MAX;
-+      mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0);
-+      mpfr_set_ui (a, 17, MPFR_RNDN);
-+      mpfr_set (b, a, MPFR_RNDN);
-+      if (mpfr_get_ui (a, MPFR_RNDN) != 17)
-+        {
-+          printf ("Error in mpfr_init2 with precision 2^31-1\n");
-+          exit (1);
-+        }
-+      mpfr_clears (a, b, (mpfr_ptr) 0);
-+    }
-+
-   tests_end_mpfr ();
-+
-   return 0;
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-03-12 11:59:47.000000000 +0000
-@@ -0,0 +1 @@
-+__gmp_const
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-03-12 11:59:47.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p7
-+3.1.0-p8
-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	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-03-12 11:59:47.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-p7"
-+#define MPFR_VERSION_STRING "3.1.0-p8"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -39,6 +39,18 @@
- # include <gmp.h>
- #endif
- 
-+/* GMP's internal __gmp_const macro has been removed on 2012-03-04:
-+     http://gmplib.org:8000/gmp/rev/d287cfaf6732
-+   const is standard and now assumed to be available. If the __gmp_const
-+   definition is no longer present in GMP, this probably means that GMP
-+   assumes that const is available; thus let's define it to const.
-+   Note: this is a temporary fix that can be backported to previous MPFR
-+   versions. In the future, __gmp_const should be replaced by const like
-+   in GMP. */
-+#ifndef __gmp_const
-+# define __gmp_const const
-+#endif
-+
- /* Avoid some problems with macro expansion if the user defines macros
-    with the same name as keywords. By convention, identifiers and macro
-    names starting with mpfr_ are reserved by MPFR. */
-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	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-03-12 11:59:47.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p7";
-+  return "3.1.0-p8";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-04-27 01:13:15.000000000 +0000
-@@ -0,0 +1 @@
-+gamma-underflow
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-04-27 01:13:15.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p8
-+3.1.0-p9
-diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c
---- mpfr-3.1.0-a/src/gamma.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/gamma.c	2012-04-27 01:13:15.000000000 +0000
-@@ -296,7 +296,7 @@
-       /* we want an upper bound for x * [log(2-x)-1].
-          since x < 0, we need a lower bound on log(2-x) */
-       mpfr_ui_sub (xp, 2, x, MPFR_RNDD);
--      mpfr_log2 (xp, xp, MPFR_RNDD);
-+      mpfr_log (xp, xp, MPFR_RNDD);
-       mpfr_sub_ui (xp, xp, 1, MPFR_RNDD);
-       mpfr_mul (xp, xp, x, MPFR_RNDU);
- 
-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	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-04-27 01:13:15.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-p8"
-+#define MPFR_VERSION_STRING "3.1.0-p9"
- 
- /* 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	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-04-27 01:13:15.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p8";
-+  return "3.1.0-p9";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c
---- mpfr-3.1.0-a/tests/tgamma.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tgamma.c	2012-04-27 01:13:15.000000000 +0000
-@@ -478,6 +478,36 @@
-   mpfr_clear (x);
- }
- 
-+/* bug found by Giridhar Tammana */
-+static void
-+test20120426 (void)
-+{
-+  mpfr_t xa, xb;
-+  int i;
-+  mpfr_exp_t emin;
-+
-+  mpfr_init2 (xa, 53);
-+  mpfr_init2 (xb, 53);
-+  mpfr_set_d (xb, -168.5, MPFR_RNDN);
-+  emin = mpfr_get_emin ();
-+  mpfr_set_emin (-1073);
-+  i = mpfr_gamma (xa, xb, MPFR_RNDN);
-+  i = mpfr_subnormalize (xa, i, MPFR_RNDN); /* new ternary value */
-+  mpfr_set_str (xb, "-9.5737343987585366746184749943e-304", 10, MPFR_RNDN);
-+  if (!((i > 0) && (mpfr_cmp (xa, xb) == 0)))
-+    {
-+      printf ("Error in test20120426, i=%d\n", i);
-+      printf ("expected ");
-+      mpfr_print_binary (xb); putchar ('\n');
-+      printf ("got      ");
-+      mpfr_print_binary (xa); putchar ('\n');
-+      exit (1);
-+    }
-+  mpfr_set_emin (emin);
-+  mpfr_clear (xa);
-+  mpfr_clear (xb);
-+}
-+
- static void
- exprange (void)
- {
-@@ -821,6 +851,7 @@
-   gamma_integer ();
-   test20071231 ();
-   test20100709 ();
-+  test20120426 ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-05-07 18:52:45.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-05-07 18:52:45.000000000 +0000
-@@ -0,0 +1 @@
-+gamma-overunderflow
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-05-07 18:52:45.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p9
-+3.1.0-p10
-diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c
---- mpfr-3.1.0-a/src/gamma.c	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/gamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -100,7 +100,8 @@
-   mpfr_t xp, GammaTrial, tmp, tmp2;
-   mpz_t fact;
-   mpfr_prec_t realprec;
--  int compared, inex, is_integer;
-+  int compared, is_integer;
-+  int inex = 0;  /* 0 means: result gamma not set yet */
-   MPFR_GROUP_DECL (group);
-   MPFR_SAVE_EXPO_DECL (expo);
-   MPFR_ZIV_DECL (loop);
-@@ -377,6 +378,15 @@
-       mpfr_mul (GammaTrial, tmp2, xp, MPFR_RNDN); /* Pi*(2-x), error (1+u)^2 */
-       err_g = MPFR_GET_EXP(GammaTrial);
-       mpfr_sin (GammaTrial, GammaTrial, MPFR_RNDN); /* sin(Pi*(2-x)) */
-+      /* If tmp is +Inf, we compute exp(lngamma(x)). */
-+      if (mpfr_inf_p (tmp))
-+        {
-+          inex = mpfr_explgamma (gamma, x, &expo, tmp, tmp2, rnd_mode);
-+          if (inex)
-+            goto end;
-+          else
-+            goto ziv_next;
-+        }
-       err_g = err_g + 1 - MPFR_GET_EXP(GammaTrial);
-       /* let g0 the true value of Pi*(2-x), g the computed value.
-          We have g = g0 + h with |h| <= |(1+u^2)-1|*g.
-@@ -411,11 +421,16 @@
-       if (MPFR_LIKELY (MPFR_CAN_ROUND (GammaTrial, realprec - err_g,
-                                        MPFR_PREC(gamma), rnd_mode)))
-         break;
-+
-+    ziv_next:
-       MPFR_ZIV_NEXT (loop, realprec);
-     }
-+
-+ end:
-   MPFR_ZIV_FREE (loop);
- 
--  inex = mpfr_set (gamma, GammaTrial, rnd_mode);
-+  if (inex == 0)
-+    inex = mpfr_set (gamma, GammaTrial, rnd_mode);
-   MPFR_GROUP_CLEAR (group);
-   mpz_clear (fact);
- 
-diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
---- mpfr-3.1.0-a/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/lngamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -49,9 +49,72 @@
-     mpfr_set_ui_2exp (s, 9, -1, MPFR_RNDN); /* 4.5 */
- }
- 
--#ifndef IS_GAMMA
-+#ifdef IS_GAMMA
-+
-+/* This function is called in case of intermediate overflow/underflow.
-+   The s1 and s2 arguments are temporary MPFR numbers, having the
-+   working precision. If the result could be determined, then the
-+   flags are updated via pexpo, y is set to the result, and the
-+   (non-zero) ternary value is returned. Otherwise 0 is returned
-+   in order to perform the next Ziv iteration. */
- static int
--unit_bit (mpfr_srcptr (x))
-+mpfr_explgamma (mpfr_ptr y, mpfr_srcptr x, mpfr_save_expo_t *pexpo,
-+                mpfr_ptr s1, mpfr_ptr s2, mpfr_rnd_t rnd)
-+{
-+  mpfr_t t1, t2;
-+  int inex1, inex2, sign;
-+  MPFR_BLOCK_DECL (flags1);
-+  MPFR_BLOCK_DECL (flags2);
-+  MPFR_GROUP_DECL (group);
-+
-+  MPFR_BLOCK (flags1, inex1 = mpfr_lgamma (s1, &sign, x, MPFR_RNDD));
-+  MPFR_ASSERTN (inex1 != 0);
-+  /* s1 = RNDD(lngamma(x)), inexact */
-+  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags1)))
-+    {
-+      if (MPFR_SIGN (s1) > 0)
-+        {
-+          MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_OVERFLOW);
-+          return mpfr_overflow (y, rnd, sign);
-+        }
-+      else
-+        {
-+          MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_UNDERFLOW);
-+          return mpfr_underflow (y, rnd == MPFR_RNDN ? MPFR_RNDZ : rnd, sign);
-+        }
-+    }
-+
-+  mpfr_set (s2, s1, MPFR_RNDN);     /* exact */
-+  mpfr_nextabove (s2);              /* v = RNDU(lngamma(z0)) */
-+
-+  if (sign < 0)
-+    rnd = MPFR_INVERT_RND (rnd);  /* since the result with be negated */
-+  MPFR_GROUP_INIT_2 (group, MPFR_PREC (y), t1, t2);
-+  MPFR_BLOCK (flags1, inex1 = mpfr_exp (t1, s1, rnd));
-+  MPFR_BLOCK (flags2, inex2 = mpfr_exp (t2, s2, rnd));
-+  /* t1 is the rounding with mode 'rnd' of a lower bound on |Gamma(x)|,
-+     t2 is the rounding with mode 'rnd' of an upper bound, thus if both
-+     are equal, so is the wanted result. If t1 and t2 differ or the flags
-+     differ, at some point of Ziv's loop they should agree. */
-+  if (mpfr_equal_p (t1, t2) && flags1 == flags2)
-+    {
-+      MPFR_ASSERTN ((inex1 > 0 && inex2 > 0) || (inex1 < 0 && inex2 < 0));
-+      mpfr_set4 (y, t1, MPFR_RNDN, sign);  /* exact */
-+      if (sign < 0)
-+        inex1 = - inex1;
-+      MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, flags1);
-+    }
-+  else
-+    inex1 = 0;  /* couldn't determine the result */
-+  MPFR_GROUP_CLEAR (group);
-+
-+  return inex1;
-+}
-+
-+#else
-+
-+static int
-+unit_bit (mpfr_srcptr x)
- {
-   mpfr_exp_t expo;
-   mpfr_prec_t prec;
-@@ -75,6 +138,7 @@
- 
-   return (x0 >> (prec % GMP_NUMB_BITS)) & 1;
- }
-+
- #endif
- 
- /* lngamma(x) = log(gamma(x)).
-@@ -99,12 +163,14 @@
-   mpfr_t s, t, u, v, z;
-   unsigned long m, k, maxm;
-   mpz_t *INITIALIZED(B);  /* variable B declared as initialized */
--  int inexact, compared;
-+  int compared;
-+  int inexact = 0;  /* 0 means: result y not set yet */
-   mpfr_exp_t err_s, err_t;
-   unsigned long Bm = 0; /* number of allocated B[] */
-   unsigned long oldBm;
-   double d;
-   MPFR_SAVE_EXPO_DECL (expo);
-+  MPFR_ZIV_DECL (loop);
- 
-   compared = mpfr_cmp_ui (z0, 1);
- 
-@@ -122,7 +188,7 @@
-   if (MPFR_EXP(z0) <= - (mpfr_exp_t) MPFR_PREC(y))
-     {
-       mpfr_t l, h, g;
--      int ok, inex2;
-+      int ok, inex1, inex2;
-       mpfr_prec_t prec = MPFR_PREC(y) + 14;
-       MPFR_ZIV_DECL (loop);
- 
-@@ -157,14 +223,14 @@
-           mpfr_sub (h, h, g, MPFR_RNDD);
-           mpfr_mul (g, z0, z0, MPFR_RNDU);
-           mpfr_add (h, h, g, MPFR_RNDU);
--          inexact = mpfr_prec_round (l, MPFR_PREC(y), rnd);
-+          inex1 = mpfr_prec_round (l, MPFR_PREC(y), rnd);
-           inex2 = mpfr_prec_round (h, MPFR_PREC(y), rnd);
-           /* Caution: we not only need l = h, but both inexact flags should
-              agree. Indeed, one of the inexact flags might be zero. In that
-              case if we assume lngamma(z0) cannot be exact, the other flag
-              should be correct. We are conservative here and request that both
-              inexact flags agree. */
--          ok = SAME_SIGN (inexact, inex2) && mpfr_cmp (l, h) == 0;
-+          ok = SAME_SIGN (inex1, inex2) && mpfr_cmp (l, h) == 0;
-           if (ok)
-             mpfr_set (y, h, rnd); /* exact */
-           mpfr_clear (l);
-@@ -172,8 +238,9 @@
-           mpfr_clear (g);
-           if (ok)
-             {
-+              MPFR_ZIV_FREE (loop);
-               MPFR_SAVE_EXPO_FREE (expo);
--              return mpfr_check_range (y, inexact, rnd);
-+              return mpfr_check_range (y, inex1, rnd);
-             }
-           /* since we have log|gamma(x)| = - log|x| - gamma*x + O(x^2),
-              if x ~ 2^(-n), then we have a n-bit approximation, thus
-@@ -205,9 +272,10 @@
-          thus lngamma(x) = log(Pi*(x-1)/sin(Pi*(2-x))) - lngamma(2-x) */
- 
-       w = precy + MPFR_INT_CEIL_LOG2 (precy);
-+      w += MPFR_INT_CEIL_LOG2 (w) + 14;
-+      MPFR_ZIV_INIT (loop, w);
-       while (1)
-         {
--          w += MPFR_INT_CEIL_LOG2 (w) + 14;
-           MPFR_ASSERTD(w >= 3);
-           mpfr_set_prec (s, w);
-           mpfr_set_prec (t, w);
-@@ -288,7 +356,9 @@
-                                   + (rnd == MPFR_RNDN)))
-                 goto end;
-             }
-+          MPFR_ZIV_NEXT (loop, w);
-         }
-+      MPFR_ZIV_FREE (loop);
-     }
- 
-   /* now z0 > 1 */
-@@ -298,10 +368,10 @@
-   /* since k is O(w), the value of log(z0*...*(z0+k-1)) is about w*log(w),
-      so there is a cancellation of ~log(w) in the argument reconstruction */
-   w = precy + MPFR_INT_CEIL_LOG2 (precy);
--
--  do
-+  w += MPFR_INT_CEIL_LOG2 (w) + 13;
-+  MPFR_ZIV_INIT (loop, w);
-+  while (1)
-     {
--      w += MPFR_INT_CEIL_LOG2 (w) + 13;
-       MPFR_ASSERTD (w >= 3);
- 
-       /* argument reduction: we compute gamma(z0 + k), where the series
-@@ -441,6 +511,15 @@
- #ifdef IS_GAMMA
-       err_s = MPFR_GET_EXP(s);
-       mpfr_exp (s, s, MPFR_RNDN);
-+      /* If s is +Inf, we compute exp(lngamma(z0)). */
-+      if (mpfr_inf_p (s))
-+        {
-+          inexact = mpfr_explgamma (y, z0, &expo, s, t, rnd);
-+          if (inexact)
-+            goto end0;
-+          else
-+            goto ziv_next;
-+        }
-       /* before the exponential, we have s = s0 + h where
-          |h| <= (2m+48)*ulp(s), thus exp(s0) = exp(s) * exp(-h).
-          For |h| <= 1/4, we have |exp(h)-1| <= 1.2*|h| thus
-@@ -480,16 +559,26 @@
-       err_s = (err_t == err_s) ? 1 + err_s : ((err_t > err_s) ? err_t : err_s);
-       err_s += 1 - MPFR_GET_EXP(s);
- #endif
-+      if (MPFR_LIKELY (MPFR_CAN_ROUND (s, w - err_s, precy, rnd)))
-+        break;
-+#ifdef IS_GAMMA
-+    ziv_next:
-+#endif
-+      MPFR_ZIV_NEXT (loop, w);
-     }
--  while (MPFR_UNLIKELY (!MPFR_CAN_ROUND (s, w - err_s, precy, rnd)));
- 
-+#ifdef IS_GAMMA
-+ end0:
-+#endif
-   oldBm = Bm;
-   while (Bm--)
-     mpz_clear (B[Bm]);
-   (*__gmp_free_func) (B, oldBm * sizeof (mpz_t));
- 
-  end:
--  inexact = mpfr_set (y, s, rnd);
-+  if (inexact == 0)
-+    inexact = mpfr_set (y, s, rnd);
-+  MPFR_ZIV_FREE (loop);
- 
-   mpfr_clear (s);
-   mpfr_clear (t);
-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	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-05-07 18:52:45.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-p9"
-+#define MPFR_VERSION_STRING "3.1.0-p10"
- 
- /* 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	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-05-07 18:52:45.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p9";
-+  return "3.1.0-p10";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c
---- mpfr-3.1.0-a/tests/tgamma.c	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tgamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -838,6 +838,175 @@
-     exit (1);
- }
- 
-+/* Test mpfr_gamma in precision p1 by comparing it with exp(lgamma(x))
-+   computing with a working precision p2. Assume that x is not an
-+   integer <= 2. */
-+static void
-+exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2)
-+{
-+  mpfr_t yd, yu, zd, zu;
-+  int inexd, inexu, sign;
-+  int underflow = -1, overflow = -1;  /* -1: we don't know */
-+  int got_underflow, got_overflow;
-+
-+  if (mpfr_integer_p (x) && mpfr_cmp_si (x, 2) <= 0)
-+    {
-+      printf ("Warning! x is an integer <= 2 in exp_lgamma: ");
-+      mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); putchar ('\n');
-+      return;
-+    }
-+  mpfr_inits2 (p2, yd, yu, (mpfr_ptr) 0);
-+  inexd = mpfr_lgamma (yd, &sign, x, MPFR_RNDD);
-+  mpfr_set (yu, yd, MPFR_RNDN);  /* exact */
-+  if (inexd)
-+    mpfr_nextabove (yu);
-+  mpfr_clear_flags ();
-+  mpfr_exp (yd, yd, MPFR_RNDD);
-+  if (! mpfr_underflow_p ())
-+    underflow = 0;
-+  if (mpfr_overflow_p ())
-+    overflow = 1;
-+  mpfr_clear_flags ();
-+  mpfr_exp (yu, yu, MPFR_RNDU);
-+  if (mpfr_underflow_p ())
-+    underflow = 1;
-+  if (! mpfr_overflow_p ())
-+    overflow = 0;
-+  if (sign < 0)
-+    {
-+      mpfr_neg (yd, yd, MPFR_RNDN);  /* exact */
-+      mpfr_neg (yu, yu, MPFR_RNDN);  /* exact */
-+      mpfr_swap (yd, yu);
-+    }
-+  /* yd < Gamma(x) < yu (strict inequalities since x != 1 and x != 2) */
-+  mpfr_inits2 (p1, zd, zu, (mpfr_ptr) 0);
-+  mpfr_clear_flags ();
-+  inexd = mpfr_gamma (zd, x, MPFR_RNDD);  /* zd <= Gamma(x) < yu */
-+  got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p ();
-+  got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p ();
-+  if (! mpfr_less_p (zd, yu) || inexd > 0 ||
-+      got_underflow != underflow ||
-+      got_overflow != overflow)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+      mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+      printf ("yu = ");
-+      mpfr_dump (yu);
-+      printf ("zd = ");
-+      mpfr_dump (zd);
-+      printf ("got inexd = %d, expected <= 0\n", inexd);
-+      printf ("got underflow = %d, expected %d\n", got_underflow, underflow);
-+      printf ("got overflow = %d, expected %d\n", got_overflow, overflow);
-+      exit (1);
-+    }
-+  mpfr_clear_flags ();
-+  inexu = mpfr_gamma (zu, x, MPFR_RNDU);  /* zu >= Gamma(x) > yd */
-+  got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p ();
-+  got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p ();
-+  if (! mpfr_greater_p (zu, yd) || inexu < 0 ||
-+      got_underflow != underflow ||
-+      got_overflow != overflow)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+      mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+      printf ("yd = ");
-+      mpfr_dump (yd);
-+      printf ("zu = ");
-+      mpfr_dump (zu);
-+      printf ("got inexu = %d, expected >= 0\n", inexu);
-+      printf ("got underflow = %d, expected %d\n", got_underflow, underflow);
-+      printf ("got overflow = %d, expected %d\n", got_overflow, overflow);
-+      exit (1);
-+    }
-+  if (mpfr_equal_p (zd, zu))
-+    {
-+      if (inexd != 0 || inexu != 0)
-+        {
-+          printf ("Error in exp_lgamma on x = ");
-+          mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+          printf ("zd = zu, thus exact, but inexd = %d and inexu = %d\n",
-+                  inexd, inexu);
-+          exit (1);
-+        }
-+      MPFR_ASSERTN (got_underflow == 0);
-+      MPFR_ASSERTN (got_overflow == 0);
-+    }
-+  else if (inexd == 0 || inexu == 0)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+          mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+          printf ("zd != zu, thus inexact, but inexd = %d and inexu = %d\n",
-+                  inexd, inexu);
-+          exit (1);
-+    }
-+  mpfr_clears (yd, yu, zd, zu, (mpfr_ptr) 0);
-+}
-+
-+static void
-+exp_lgamma_tests (void)
-+{
-+  mpfr_t x;
-+  mpfr_exp_t emin, emax;
-+  int i;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+  set_emin (MPFR_EMIN_MIN);
-+  set_emax (MPFR_EMAX_MAX);
-+
-+  mpfr_init2 (x, 96);
-+  for (i = 3; i <= 8; i++)
-+    {
-+      mpfr_set_ui (x, i, MPFR_RNDN);
-+      exp_lgamma (x, 53, 64);
-+      mpfr_nextbelow (x);
-+      exp_lgamma (x, 53, 64);
-+      mpfr_nextabove (x);
-+      mpfr_nextabove (x);
-+      exp_lgamma (x, 53, 64);
-+    }
-+  mpfr_set_str (x, "1.7", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-90.6308260837372266e+15", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* The following test gives a large positive result < +Inf */
-+  mpfr_set_str (x, "1.2b13fc45a92dea1@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* Idem for a large negative result > -Inf */
-+  mpfr_set_str (x, "-1.2b13fc45a92de81@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* The following two tests trigger an endless loop in r8186
-+     on 64-bit machines (64-bit exponent). The second one (due
-+     to undetected overflow) is a direct consequence of the
-+     first one, due to the call of Gamma(2-x) if x < 1. */
-+  mpfr_set_str (x, "1.2b13fc45a92dec8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-1.2b13fc45a92dea8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* Similar tests (overflow threshold) for 32-bit machines. */
-+  mpfr_set_str (x, "2ab68d8.657542f855111c61", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);
-+  mpfr_set_str (x, "-2ab68d6.657542f855111c61", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);
-+  /* The following test is an overflow on 32-bit and 64-bit machines.
-+     Revision r8189 fails on 64-bit machines as the flag is unset. */
-+  mpfr_set_str (x, "1.2b13fc45a92ded8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* On the following tests, with r8196, one gets an underflow on
-+     32-bit machines, while a normal result is expected (see FIXME
-+     in gamma.c:382). */
-+  mpfr_set_str (x, "-2ab68d6.657542f855111c6104", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);  /* failure on 32-bit machines */
-+  mpfr_set_str (x, "-12b13fc45a92deb.1c6c5bc964", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);  /* failure on 64-bit machines */
-+  mpfr_clear (x);
-+
-+  set_emin (emin);
-+  set_emax (emax);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -852,6 +1021,7 @@
-   test20071231 ();
-   test20100709 ();
-   test20120426 ();
-+  exp_lgamma_tests ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
diff --git a/testing/mpfr/mpfr-3.1.1-p2.patch b/testing/mpfr/mpfr-3.1.1-p2.patch
deleted file mode 100644
index 43dfcbfe3..000000000
--- a/testing/mpfr/mpfr-3.1.1-p2.patch
+++ /dev/null
@@ -1,405 +0,0 @@
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:28:51.000000000 +0000
-@@ -0,0 +1 @@
-+get_decimal64
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-07-03 15:01:13.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:28:51.000000000 +0000
-@@ -1 +1 @@
--3.1.1
-+3.1.1-p1
-diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c
---- mpfr-3.1.1-a/src/get_d64.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/get_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -32,6 +32,10 @@
- 
- #ifdef MPFR_WANT_DECIMAL_FLOATS
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- #ifdef DPD_FORMAT
- static int T[1000] = {
-   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32,
-@@ -142,26 +146,14 @@
- static _Decimal64
- get_decimal64_min (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 0;
--  x.s.manh = 0;
--  x.s.manl = 1;
--  return x.d;
-+  return negative ? - 1E-398dd : 1E-398dd;
- }
- 
- /* construct the decimal64 largest finite number with given sign */
- static _Decimal64
- get_decimal64_max (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 1919;
--  x.s.manh = 1048575; /* 2^20-1 */
--  x.s.manl = ~0;
--  return x.d;
-+  return negative ? - DEC64_MAX : DEC64_MAX;
- }
- 
- /* one-to-one conversion:
-@@ -334,7 +326,8 @@
-   /* the largest decimal64 number is just below 10^(385) < 2^1279 */
-   else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */
-     {
--      if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+      if (rnd_mode == MPFR_RNDZ
-+          || (rnd_mode == MPFR_RNDU && negative != 0)
-           || (rnd_mode == MPFR_RNDD && negative == 0))
-         return get_decimal64_max (negative);
-       else
-@@ -354,6 +347,15 @@
-              which corresponds to s=[0.]1000...000 and e=-397 */
-           if (e < -397)
-             {
-+              if (rnd_mode == MPFR_RNDN && e == -398)
-+                {
-+                  /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal),
-+                     src should round to +/- 1E-398 in MPFR_RNDN. */
-+                  mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA);
-+                  return e == -398 && s[negative] <= '5' ?
-+                    get_decimal64_zero (negative) :
-+                    get_decimal64_min (negative);
-+                }
-               if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN
-                   || (rnd_mode == MPFR_RNDD && negative == 0)
-                   || (rnd_mode == MPFR_RNDU && negative != 0))
-@@ -379,7 +381,8 @@
-          which corresponds to s=[0.]9999...999 and e=385 */
-       else if (e > 385)
-         {
--          if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+          if (rnd_mode == MPFR_RNDZ
-+              || (rnd_mode == MPFR_RNDU && negative != 0)
-               || (rnd_mode == MPFR_RNDD && negative == 0))
-             return get_decimal64_max (negative);
-           else
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-07-03 15:01:19.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1"
-+#define MPFR_VERSION_STRING "3.1.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1";
-+  return "3.1.1-p1";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c
---- mpfr-3.1.1-a/tests/tget_set_d64.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tget_set_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,6 +25,10 @@
- #include <stdlib.h> /* for exit */
- #include "mpfr-test.h"
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- /* #define DEBUG */
- 
- static void
-@@ -149,6 +153,15 @@
-   mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ);
-   mpfr_set (y, x, MPFR_RNDZ);
-   d = mpfr_get_decimal64 (x, MPFR_RNDU);
-+  ASSERT_ALWAYS (d == DEC64_MAX);
-+  mpfr_set_ui (x, 0, MPFR_RNDZ);
-+  mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-+  ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-+
-+  mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ);
-+  mpfr_set (y, x, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDA);
-+  ASSERT_ALWAYS (d == -DEC64_MAX);
-   mpfr_set_ui (x, 0, MPFR_RNDZ);
-   mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-   ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-@@ -225,6 +238,83 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+check_overflow (void)
-+{
-+  mpfr_t x;
-+  int err = 0, neg, rnd;
-+
-+  mpfr_init2 (x, 96);
-+  for (neg = 0; neg < 2; neg++)
-+    RND_LOOP (rnd)
-+      {
-+        _Decimal64 d, e;
-+        mpfr_rnd_t r = (mpfr_rnd_t) rnd;
-+        int sign = neg ? -1 : 1;
-+
-+        e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX;
-+        /* This tests the binary exponent e > 1279 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 1 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the decimal exponent e > 385 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 2 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the last else (-382 <= e <= 385) of get_d64.c */
-+        mpfr_set_decimal64 (x, e, MPFR_RNDA);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 3 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+      }
-+  mpfr_clear (x);
-+  if (err)
-+    exit (1);
-+}
-+
-+static void
-+check_tiny (void)
-+{
-+  mpfr_t x;
-+  _Decimal64 d;
-+
-+  /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round
-+     to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between
-+     0 and 1E-398 is not a representable binary number, so that there
-+     are no tests for it. */
-+  mpfr_init2 (x, 128);
-+  mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_clear (x);
-+}
-+
- int
- main (void)
- {
-@@ -241,6 +331,8 @@
-   check_inf_nan ();
-   check_random ();
-   check_native ();
-+  check_overflow ();
-+  check_tiny ();
- 
-   tests_end_mpfr ();
-   return 0;
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:35:12.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:35:12.000000000 +0000
-@@ -0,0 +1 @@
-+strtofr-ternary-value
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:35:12.000000000 +0000
-@@ -1 +1 @@
--3.1.1-p1
-+3.1.1-p2
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:35:12.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1-p1"
-+#define MPFR_VERSION_STRING "3.1.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c
---- mpfr-3.1.1-a/src/strtofr.c	2012-07-03 15:01:16.000000000 +0000
-+++ mpfr-3.1.1-b/src/strtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -667,6 +667,20 @@
-           /* (z, exp_z) = base^(exp_base-pstr_size) */
-           z = result + 2*ysize + 1;
-           err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize);
-+          /* Since we want y/z rounded toward zero, we must get an upper
-+             bound of z. If err >= 0, the error on z is bounded by 2^err. */
-+          if (err >= 0)
-+            {
-+              mp_limb_t cy;
-+              unsigned long h = err / GMP_NUMB_BITS;
-+              unsigned long l = err - h * GMP_NUMB_BITS;
-+
-+              if (h >= ysize) /* not enough precision in z */
-+                goto next_loop;
-+              cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l);
-+              if (cy != 0) /* the code below requires z on ysize limbs */
-+                goto next_loop;
-+            }
-           exact = exact && (err == -1);
-           if (err == -2)
-             goto underflow; /* FIXME: Sure? */
-@@ -730,6 +744,7 @@
-                                        MPFR_RNDN, rnd, MPFR_PREC(x)))
-         break;
- 
-+    next_loop:
-       /* update the prec for next loop */
-       MPFR_ZIV_NEXT (loop, prec);
-     } /* loop */
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:35:12.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1-p1";
-+  return "3.1.1-p2";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c
---- mpfr-3.1.1-a/tests/tstrtofr.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tstrtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -1105,6 +1105,92 @@
-   mpfr_clear (y);
- }
- 
-+/* From a bug reported by Joseph S. Myers
-+   https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */
-+static void
-+bug20120814 (void)
-+{
-+  mpfr_exp_t emin = -30, e;
-+  mpfr_t x, y;
-+  int r;
-+  char s[64], *p;
-+
-+  mpfr_init2 (x, 2);
-+  mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN);
-+  mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD);
-+  s[0] = s[1];
-+  s[1] = '.';
-+  for (p = s; *p != 0; p++) ;
-+  *p = 'e';
-+  sprintf (p + 1, "%d", (int) e - 1);
-+
-+  mpfr_init2 (y, 4);
-+  r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN);
-+  if (r <= 0 || ! mpfr_equal_p (x, y))
-+    {
-+      printf ("Error in bug20120814\n");
-+      printf ("mpfr_strtofr failed on string \"%s\"\n", s);
-+      printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin);
-+      printf ("Got inex = %-6d and y = ", r);
-+      mpfr_dump (y);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+  mpfr_clear (y);
-+}
-+
-+static void
-+bug20120829 (void)
-+{
-+  mpfr_t x1, x2, e;
-+  int inex1, inex2, i, r;
-+  char s[48] = "1e-1";
-+
-+  mpfr_init2 (e, 128);
-+  mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0);
-+
-+  inex1 = mpfr_set_si (e, -1, MPFR_RNDN);
-+  MPFR_ASSERTN (inex1 == 0);
-+
-+  for (i = 1; i <= sizeof(s) - 5; i++)
-+    {
-+      s[3+i] = '0';
-+      s[4+i] = 0;
-+      inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN);
-+      MPFR_ASSERTN (inex1 == 0);
-+      RND_LOOP(r)
-+        {
-+          mpfr_rnd_t rnd = (mpfr_rnd_t) r;
-+
-+          inex1 = mpfr_exp10 (x1, e, rnd);
-+          inex1 = SIGN (inex1);
-+          inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd);
-+          inex2 = SIGN (inex2);
-+          /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do:
-+             strtofr.c:...: MPFR assertion failed: cy == 0
-+             r8396 is OK.
-+             On 64-bit machines, for i = 15,
-+             r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0)
-+             r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize
-+             r8394 and r8396 are OK.
-+          */
-+          if (! mpfr_equal_p (x1, x2) || inex1 != inex2)
-+            {
-+              printf ("Error in bug20120829 for i = %d, rnd = %s\n",
-+                      i, mpfr_print_rnd_mode (rnd));
-+              printf ("Expected inex = %d, x = ", inex1);
-+              mpfr_dump (x1);
-+              printf ("Got      inex = %d, x = ", inex2);
-+              mpfr_dump (x2);
-+              exit (1);
-+            }
-+        }
-+    }
-+
-+  mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1117,6 +1203,8 @@
-   check_retval ();
-   bug20081028 ();
-   test20100310 ();
-+  bug20120814 ();
-+  bug20120829 ();
- 
-   tests_end_mpfr ();
-   return 0;
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 08e3155ac..000000000
--- a/testing/mutter/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169169 2012-10-18 19:23:25Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.6.1
-pkgrel=2
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm')
-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=('4bec46ceb114a78d5f851823d8966b9b386a9319fbec740ff59bf5eb265d6637')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/mutter \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/mutter/mutter.install b/testing/mutter/mutter.install
deleted file mode 100644
index c47f1cef2..000000000
--- a/testing/mutter/mutter.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=mutter
-
-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
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/mysql/PKGBUILD b/testing/mysql/PKGBUILD
deleted file mode 100644
index 74a6654e6..000000000
--- a/testing/mysql/PKGBUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# $Id: PKGBUILD 165319 2012-08-15 14:54:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=mysql
-pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.27
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL')
-url="https://www.mysql.com/products/community/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
-        'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
-md5sums=('82baf46acfced6eef072e9d8a479c86e'
-         'e7eb2faeab755cbb2fe03542bf328da9'
-         '1c949c0dbea5206af0db14942d9927b6'
-         '6ea6ceb360d09a774e87335ee098ddd5'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6'
-         'a0e1460c276a50a9666c331de83271f2')
-
-build() {
-  mkdir build
-  cd build
-
-  # CFLAGS/CXXFLAGS as suggested upstream
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/mysql \
-    -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-    -DDEFAULT_CHARSET=utf8 \
-    -DDEFAULT_COLLATION=utf8_general_ci \
-    -DENABLED_LOCAL_INFILE=ON \
-    -DINSTALL_INFODIR=share/mysql/docs \
-    -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
-    -DINSTALL_SCRIPTDIR=bin \
-    -DINSTALL_INCLUDEDIR=include/mysql \
-    -DINSTALL_DOCREADMEDIR=share/mysql \
-    -DINSTALL_SUPPORTFILESDIR=share/mysql \
-    -DINSTALL_MYSQLSHAREDIR=share/mysql \
-    -DINSTALL_DOCDIR=share/mysql/docs \
-    -DINSTALL_SHAREDIR=share/mysql \
-    -DWITH_READLINE=ON \
-    -DWITH_ZLIB=system \
-    -DWITH_SSL=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
-
-  make
-}
-
-package_libmysqlclient(){
-  pkgdesc="MySQL client libraries"
-  depends=('openssl')
-  
-  cd build
-  for dir in include libmysql libmysqld libservices; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  install -d "${pkgdir}"/usr/bin
-  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-}
-
-package_mysql-clients(){
-  pkgdesc="MySQL client tools"
-  depends=('libmysqlclient')
-  
-  cd build
-  make -C client DESTDIR="${pkgdir}" install
-
-  # install man pages
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-
-  # provided by mysql
-  rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-}
-
-package_mysql(){
-  pkgdesc="A fast SQL database server"
-  backup=('etc/mysql/my.cnf')
-  install=mysql.install
-  depends=('mysql-clients' 'systemd-tools')
-  options=('emptydirs')
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf
-  install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld
-  install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post
-  install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf
-  install -d "${pkgdir}"/usr/lib/systemd/system
-  install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/
-
-  # provided by libmysqlclient
-  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm "${pkgdir}"/usr/lib/libmysql*
-  rm -r "${pkgdir}"/usr/include/
-  rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-  
-  # provided by mysql-clients
-  rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-  # not needed
-  rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
-  rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-  install -dm700 "${pkgdir}"/var/lib/mysql
-}
diff --git a/testing/mysql/my.cnf b/testing/mysql/my.cnf
deleted file mode 100644
index 9a41b4fc3..000000000
--- a/testing/mysql/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-datadir		= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-# 
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/testing/mysql/mysql.install b/testing/mysql/mysql.install
deleted file mode 100644
index a98f1a877..000000000
--- a/testing/mysql/mysql.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
-
-  usr/bin/systemd-tmpfiles --create mysqld.conf
-}
-
-post_upgrade(){
-  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/testing/mysql/mysqld-post.sh b/testing/mysql/mysqld-post.sh
deleted file mode 100755
index 8dc9c4eea..000000000
--- a/testing/mysql/mysqld-post.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-while true; do
-    response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-    echo "$response" | grep -q "mysqld is alive" && break
-    sleep 1
-done
diff --git a/testing/mysql/mysqld-tmpfile.conf b/testing/mysql/mysqld-tmpfile.conf
deleted file mode 100644
index 6883dc798..000000000
--- a/testing/mysql/mysqld-tmpfile.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -
diff --git a/testing/mysql/mysqld.rc b/testing/mysql/mysqld.rc
deleted file mode 100755
index 4bbddb5a4..000000000
--- a/testing/mysql/mysqld.rc
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting MySQL Server"
-    [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MySQL Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mysql/mysqld.service b/testing/mysql/mysqld.service
deleted file mode 100644
index 0175c685b..000000000
--- a/testing/mysql/mysqld.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=MySQL Server
-
-[Service]
-User=mysql
-ExecStart=/usr/bin/mysqld --user=mysql
-ExecStartPost=/usr/bin/mysqld-post
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nautilus-open-terminal/PKGBUILD b/testing/nautilus-open-terminal/PKGBUILD
deleted file mode 100644
index a3104098a..000000000
--- a/testing/nautilus-open-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169167 2012-10-18 19:23:18Z jgc $
-# 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=3
-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' '!emptydirs')
-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 1cf003352..000000000
--- a/testing/nautilus-sendto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169166 2012-10-18 19:23:15Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Tor Krill <tor@krill.nu>
-
-pkgname=nautilus-sendto
-pkgver=3.6.0
-pkgrel=1
-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' 'gupnp')
-options=('!libtool' '!emptydirs')
-install=nautilus-sendto.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$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 d33a1b261..000000000
--- a/testing/nautilus-sendto/nautilus-sendto.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    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 51b68261e..000000000
--- a/testing/nautilus/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169536 2012-10-23 10:44:23Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nautilus
-pkgver=3.6.1
-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' 'libnotify')
-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=('7b30cf1ce538c9d4cdff883f54d1edcbdffbe146dc1b819bbfacd5e6837df390')
-
-build() {
-  cd "$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 "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install
deleted file mode 100644
index 082126d24..000000000
--- a/testing/nautilus/nautilus.install
+++ /dev/null
@@ -1,14 +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
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/nepomuk-core/PKGBUILD b/testing/nepomuk-core/PKGBUILD
deleted file mode 100644
index bff55942b..000000000
--- a/testing/nepomuk-core/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 167563 2012-10-02 18:56:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=nepomuk-core
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
-url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'regression-crash.patch')
-sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
-          'e6237844c0f9d5838b827068fe768394e0df0cff')
-
-build() {
-  # KDEBUG 307388
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/regression-crash.patch
-  cd ../
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Fix the python shebang
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
-}
diff --git a/testing/nepomuk-core/regression-crash.patch b/testing/nepomuk-core/regression-crash.patch
deleted file mode 100644
index a683c133b..000000000
--- a/testing/nepomuk-core/regression-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 804e54f83ade8a377d392d350981ead07f60a9d3
-Author: David Faure <faure@kde.org>
-Date:   Tue Oct 2 20:27:03 2012 +0200
-
-    Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
-    
-    ... which emitted the signal. So don't use a direct delete.
-    
-    BUG: 307388
-    FIXED-IN: 4.9.3
-
-diff --git a/services/filewatch/nepomukfilewatch.cpp b/services/filewatch/nepomukfilewatch.cpp
-index 9fd5d9c..94db504 100644
---- a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -323,7 +323,8 @@ void Nepomuk2::FileWatch::connectToKDirWatch()
- void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
- {
-     // we do it the brutal way for now hoping with new kernels and defaults this will never happen
--    delete m_dirWatch;
-+    // Delete the KInotify and switch to KDirNotify dbus signals
-+    m_dirWatch->deleteLater();
-     m_dirWatch = 0;
-     connectToKDirWatch();
- }
diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD
deleted file mode 100644
index 3bcad6c09..000000000
--- a/testing/net-snmp/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 168010 2012-10-05 06:54:12Z eric $
-# Maintainer: 
-# Contributor: Dale Blount <dale@archlinux.org>
-
-pkgname=net-snmp
-pkgver=5.7.1
-pkgrel=4
-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 snmpd.service libnl32.patch)
-sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a'
-          '2bdc2839ce09d7daa608cd54687fa8beb47ed907'
-          'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
-          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
-          'f59ddc049c1c689f04e68c3c7cd8b8e301df3158'
-          '74a9848b95f63378eb1753fc309d2b74de5afb0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
-  patch -Np1 -i "$srcdir/libnl32.patch"
-  autoreconf -f -i
-
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --enable-ucd-snmp-compatibility \
-    --enable-ipv6 \
-    --with-python-modules \
-    --with-default-snmp-version="3" \
-    --with-sys-contact="root@localhost" \
-    --with-sys-location="Unknown" \
-    --with-logfile="/var/log/snmpd.log" \
-    --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp" \
-    --disable-static
-  make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/net-snmp/libnl32.patch b/testing/net-snmp/libnl32.patch
deleted file mode 100644
index d93d7ef67..000000000
--- a/testing/net-snmp/libnl32.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c	2011-09-28 06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c	2012-02-09 20:02:49.136022132 +0100
-@@ -566,8 +566,9 @@
- static int
- tcpTable_load_netlink(void)
- {
-+	int err;
- 	/*  TODO: perhaps use permanent nl handle? */
--	struct nl_handle *nl = nl_handle_alloc();
-+	struct nl_sock *nl = nl_socket_alloc();
- 
- 	if (nl == NULL) {
- 		DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n"));
-@@ -575,10 +576,10 @@
- 		return -1;
- 	}
- 
--	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
--		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
--		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
--		nl_handle_destroy(nl);
-+	if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
-+		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err)));
-+		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err));
-+		nl_socket_free(nl);
- 		return -1;
- 	}
- 
-@@ -590,10 +591,10 @@
- 	struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
- 	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
- 
--	if (nl_send_auto_complete(nl, nm) < 0) {
--		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
--		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
--		nl_handle_destroy(nl);
-+	if ((err = nl_send_auto_complete(nl, nm)) < 0) {
-+		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err)));
-+		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err));
-+		nl_socket_free(nl);
- 		return -1;
- 	}
- 	nlmsg_free(nm);
-@@ -604,9 +605,9 @@
- 
- 	while (running) {
- 		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
--			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
--			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
--			nl_handle_destroy(nl);
-+			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len)));
-+			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len));
-+			nl_socket_free(nl);
- 			return -1;
- 		}
- 
-@@ -655,7 +656,7 @@
- 		free(buf);
- 	}
- 
--	nl_handle_destroy(nl);
-+	nl_socket_free(nl);
- 
- 	if (tcp_head) {
- 		DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n"));
-diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
---- net-snmp-5.7.1/configure.d/config_os_libs2	2011-09-28 06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2	2012-02-09 20:10:44.282165275 +0100
-@@ -224,8 +224,9 @@
- if test "x$with_nl" != "xno"; then
-     case $target_os in
-     linux*) # Check for libnl (linux)
-+	CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
- 	NETSNMP_SEARCH_LIBS(
--	    nl_connect, nl,
-+	    nl_connect, nl-3,
- 	    [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
-     ;;
-     esac
diff --git a/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-snmp/snmpd.service b/testing/net-snmp/snmpd.service
deleted file mode 100644
index 111a8d6a9..000000000
--- a/testing/net-snmp/snmpd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Simple Network Management Protocol (SNMP) Daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/snmpd
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/net-tools/Makefile.patch b/testing/net-tools/Makefile.patch
deleted file mode 100644
index aaacd6b78..000000000
--- a/testing/net-tools/Makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.old	2012-08-07 22:07:58.235437087 +0200
-+++ Makefile	2012-08-07 22:10:21.192104345 +0200
-@@ -239,12 +239,12 @@
- 	install -m 0755 -d ${BASEDIR}/bin
- 	install -m 0755 arp        ${BASEDIR}/sbin
- 	install -m 0755 hostname   ${BASEDIR}/bin
--	install -m 0755 ifconfig   ${BASEDIR}/bin
-+	install -m 0755 ifconfig   ${BASEDIR}/sbin
- 	install -m 0755 nameif     ${BASEDIR}/sbin
- 	install -m 0755 netstat    ${BASEDIR}/bin
- 	install -m 0755 plipconfig $(BASEDIR)/sbin
- 	install -m 0755 rarp       ${BASEDIR}/sbin
--	install -m 0755 route      ${BASEDIR}/bin
-+	install -m 0755 route      ${BASEDIR}/sbin
- 	install -m 0755 slattach   $(BASEDIR)/sbin
- ifeq ($(HAVE_IP_TOOLS),1)
- 	install -m 0755 ipmaddr    $(BASEDIR)/sbin
diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD
deleted file mode 100644
index fec4a9806..000000000
--- a/testing/net-tools/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 164985 2012-08-07 20:09:18Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=net-tools
-pkgver=1.60.20120804git
-pkgrel=2
-pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://net-tools.sourceforge.net/"
-depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use git checkout instead
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	Makefile.patch)
-options=(!makeflags)
-install=net-tools.install
-sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
-          '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/Makefile.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/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/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD
deleted file mode 100644
index ff89e15c3..000000000
--- a/testing/network-manager-applet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165064 2012-08-09 22:48:27Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-
-pkgname=network-manager-applet
-pkgver=0.9.6.2
-pkgrel=1
-pkgdesc="GNOME frontends to NetWorkmanager"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify'
-         'gnome-icon-theme' 'mobile-broadband-provider-info' 'iso-codes')
-makedepends=('intltool' 'gnome-bluetooth')
-optdepends=('gnome-bluetooth: for PAN/DUN support')
-options=('!libtool' '!emptydirs')
-install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('96c79ce199fe7770b66f2ddc5ee0a4b07a0ea1eaf5e2186b78d8dd69e38a3069')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/networkmanager \
-      --disable-static \
-      --disable-maintainer-mode \
-      --disable-migration
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
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 255ea1f9a..000000000
--- a/testing/network-manager-applet/network-manager-applet.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 0.9.6.0) < 0 )); then
-    gconfpkg --uninstall network-manager-applet
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-} 
diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD
deleted file mode 100644
index 48d521bcf..000000000
--- a/testing/networkmanager-openconnect/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 165062 2012-08-09 22:47:07Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openconnect
-pkgver=0.9.6.2
-pkgrel=1
-pkgdesc="NetworkManager VPN integration for openconnect"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" 'openconnect' 'gconf' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('3f53d87dbeb00fc841ef5981e6f1a1a192c65d273386246d48245cca84fa41b0')
-
-build() {
-  cd NetworkManager-openconnect-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-openconnect-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install
deleted file mode 100644
index 7bd4d44f9..000000000
--- a/testing/networkmanager-openconnect/networkmanager-openconnect.install
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=networkmanager-openconnect
-
-post_install() {
-  getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect
-  getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect
-  passwd -l nm-openconnect > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect
-  getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect
-}
diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD
deleted file mode 100644
index 16f27e614..000000000
--- a/testing/networkmanager-openvpn/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164976 2012-08-07 18:09:27Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openvpn
-pkgver=0.9.6.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for OpenVPN"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-install=networkmanager-openvpn.install
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3')
-
-build() {
-  cd NetworkManager-openvpn-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-openvpn-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-openvpn/networkmanager-openvpn.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD
deleted file mode 100644
index b4f975a2c..000000000
--- a/testing/networkmanager-pptp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164977 2012-08-07 18:10:19Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-pptp
-pkgver=0.9.6.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for pptp "
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
-sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4')
-
-build() {
-  cd NetworkManager-pptp-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-pptp-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-pptp/networkmanager-pptp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD
deleted file mode 100644
index db34ef9c2..000000000
--- a/testing/networkmanager-vpnc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164978 2012-08-07 18:11:11Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-vpnc
-pkgver=0.9.6.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for vpnc"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-vpnc.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2')
-
-build() {
-  cd NetworkManager-vpnc-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-vpnc-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-vpnc/networkmanager-vpnc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf
deleted file mode 100644
index c37b59680..000000000
--- a/testing/networkmanager/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD
deleted file mode 100644
index 9e763f63f..000000000
--- a/testing/networkmanager/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 169165 2012-10-18 19:23:13Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: Jan de Groot <jgc@archlinxu.org>
-# Contributor: 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
-_pkgname=NetworkManager
-pkgver=0.9.6.0
-pkgrel=5
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/"
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
-         libsoup systemd)
-makedepends=(intltool dhcpcd iptables gobject-introspection)
-optdepends=('modemmanager: for modem management service'
-            'dhcpcd: alternative DHCP client; does not support DHCPv6'
-            'iptables: Connection sharing'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support'
-            'openresolv: resolvconf support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-        nm-polkit-permissive.patch repair-signals.patch systemd-sleep.patch)
-sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
-            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6'
-            '24c181ab69e769e703e45f64a552add5df5de22fbcd8899d588add053674420a')
-
-build() {
-  cd $_pkgname-$pkgver
-
-  patch -Np1 -i ../disable_set_hostname.patch
-  patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../nm-polkit-permissive.patch
-  patch -Np1 -i ../repair-signals.patch # FS#31115
-  patch -Np1 -i ../systemd-sleep.patch
-  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-distro=arch \
-    --with-dhclient=/usr/sbin/dhclient \
-    --with-dhcpcd=/usr/sbin/dhcpcd \
-    --with-iptables=/usr/sbin/iptables \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/sbin/resolvconf \
-    --with-session-tracking=systemd \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax
-
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-
-  rm -r "$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/dnsmasq-path.patch b/testing/networkmanager/dnsmasq-path.patch
deleted file mode 100644
index c0e713266..000000000
--- a/testing/networkmanager/dnsmasq-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c	2011-10-10 23:38:20.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c	2012-03-06 09:07:24.137460927 +0100
-@@ -52,8 +52,11 @@
- find_dnsmasq (void)
- {
- 	static const char *paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
-diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c	2011-04-19 07:06:22.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c	2012-03-06 09:07:58.603851818 +0100
-@@ -170,8 +170,11 @@
- nm_find_dnsmasq (void)
- {
- 	static const char *dnsmasq_binary_paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
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/networkmanager/nm-polkit-permissive.patch b/testing/networkmanager/nm-polkit-permissive.patch
deleted file mode 100644
index 1ac406224..000000000
--- a/testing/networkmanager/nm-polkit-permissive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
---- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive	2011-03-24 14:21:35.100912222 -0500
-+++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in	2011-03-24 14:21:49.916726997 -0500
-@@ -95,7 +95,7 @@
-     <_message>System policy prevents modification of network settings for all users</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_admin_keep</allow_active>
-+      <allow_active>yes</allow_active>
-     </defaults>
-   </action>
- 
diff --git a/testing/networkmanager/repair-signals.patch b/testing/networkmanager/repair-signals.patch
deleted file mode 100644
index cf1319dc5..000000000
--- a/testing/networkmanager/repair-signals.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 13 Sep 2012 09:32:53 +0000
-Subject: core: wait until we daemonized before setting up signals (bgo #683932)
-
-If we mask signals before daemonizing, the daemon process will not be
-able to handle them, and thus would be unkillable with anything other
-than SIGKILL.
----
-diff --git a/src/main.c b/src/main.c
-index 8bc6d3f..5b82cfa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -401,10 +401,6 @@ main (int argc, char *argv[])
- 		exit (1);
- 	}
- 
--	/* Set up unix signal handling */
--	if (!setup_signals ())
--		exit (1);
--
- 	/* Set locale to be able to use environment variables */
- 	setlocale (LC_ALL, "");
- 
-@@ -501,6 +497,10 @@ main (int argc, char *argv[])
- 			wrote_pidfile = TRUE;
- 	}
- 
-+	/* Set up unix signal handling - before creating threads, but after daemonizing! */
-+	if (!setup_signals ())
-+		exit (1);
-+
- 	if (g_fatal_warnings) {
- 		GLogLevelFlags fatal_mask;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/networkmanager/systemd-fallback.patch b/testing/networkmanager/systemd-fallback.patch
deleted file mode 100644
index f5acc9dc6..000000000
--- a/testing/networkmanager/systemd-fallback.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac
---- NetworkManager-0.9.3.995/configure.ac	2012-03-02 01:05:21.000000000 +0100
-+++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac	2012-03-06 16:55:58.294793902 +0100
-@@ -344,7 +344,7 @@
- case $with_session_tracking in
-     ck|none) ;;
-     systemd)
--        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-         ;;
-     *)
- 	AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd])
-diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c
---- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c	2012-02-27 16:57:16.000000000 +0100
-+++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c	2012-03-06 16:55:01.285264295 +0100
-@@ -28,6 +28,10 @@
- #include <glib/gstdio.h>
- #include <systemd/sd-login.h>
- #include <stdlib.h>
-+#include <systemd/sd-daemon.h>
-+#include <sys/stat.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
- 
- #include "nm-session-utils.h"
- #include "nm-session-monitor.h"
-@@ -107,10 +111,20 @@
- 	return source;
- }
- 
-+/********************************************************************/
-+
-+#define CKDB_PATH "/var/run/ConsoleKit/database"
-+
- struct _NMSessionMonitor {
- 	GObject parent_instance;
- 
- 	GSource *sd_source;
-+
-+	GKeyFile *database;
-+	GFileMonitor *database_monitor;
-+	time_t database_mtime;
-+	GHashTable *sessions_by_uid;
-+	GHashTable *sessions_by_user;
- };
- 
- struct _NMSessionMonitorClass {
-@@ -130,6 +144,215 @@
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+typedef struct {
-+	char *user;
-+	uid_t uid;
-+	gboolean local;
-+	gboolean active;
-+} Session;
-+
-+static void
-+session_free (Session *s)
-+{
-+	g_free (s->user);
-+	memset (s, 0, sizeof (Session));
-+	g_free (s);
-+}
-+
-+static gboolean
-+check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error)
-+{
-+	if (g_key_file_has_key (keyfile, group, key, error))
-+		return TRUE;
-+
-+	if (!error) {
-+		g_set_error (error,
-+			         NM_SESSION_MONITOR_ERROR,
-+			         NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE,
-+			         "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key",
-+			         group, key);
-+	}
-+	return FALSE;
-+}
-+
-+static Session *
-+session_new (GKeyFile *keyfile, const char *group, GError **error)
-+{
-+	GError *local = NULL;
-+	Session *s;
-+	const char *uname = NULL;
-+
-+	s = g_new0 (Session, 1);
-+	g_assert (s);
-+
-+	s->uid = G_MAXUINT; /* paranoia */
-+	if (!check_key (keyfile, group, "uid", &local))
-+		goto error;
-+	s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!check_key (keyfile, group, "is_active", &local))
-+		goto error;
-+	s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!check_key (keyfile, group, "is_local", &local))
-+		goto error;
-+	s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!nm_session_uid_to_user (s->uid, &uname, error))
-+		return FALSE;
-+	s->user = g_strdup (uname);
-+
-+	return s;
-+
-+error:
-+	session_free (s);
-+	g_propagate_error (error, local);
-+	return NULL;
-+}
-+
-+static void
-+session_merge (Session *src, Session *dest)
-+{
-+	g_return_if_fail (src != NULL);
-+	g_return_if_fail (dest != NULL);
-+
-+	g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0);
-+	g_warn_if_fail (src->uid == dest->uid);
-+
-+	dest->local = (dest->local || src->local);
-+	dest->active = (dest->active || src->active);
-+}
-+
-+/********************************************************************/
-+
-+static void
-+free_database (NMSessionMonitor *self)
-+{
-+	if (self->database != NULL) {
-+		g_key_file_free (self->database);
-+		self->database = NULL;
-+	}
-+
-+	g_hash_table_remove_all (self->sessions_by_uid);
-+	g_hash_table_remove_all (self->sessions_by_user);
-+}
-+
-+static gboolean
-+reload_database (NMSessionMonitor *self, GError **error)
-+{
-+	struct stat statbuf;
-+	char **groups = NULL;
-+	gsize len = 0, i;
-+	Session *s;
-+
-+	free_database (self);
-+
-+	errno = 0;
-+	if (stat (CKDB_PATH, &statbuf) != 0) {
-+		g_set_error (error,
-+		             NM_SESSION_MONITOR_ERROR,
-+		             errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+		             "Error statting file " CKDB_PATH ": %s",
-+		             strerror (errno));
-+		goto error;
-+	}
-+	self->database_mtime = statbuf.st_mtime;
-+
-+	self->database = g_key_file_new ();
-+	if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error))
-+		goto error;
-+
-+	groups = g_key_file_get_groups (self->database, &len);
-+	if (!groups) {
-+		g_set_error_literal (error,
-+		                     NM_SESSION_MONITOR_ERROR,
-+		                     NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+		                     "Could not load groups from " CKDB_PATH "");
-+		goto error;
-+	}
-+
-+	for (i = 0; i < len; i++) {
-+		Session *found;
-+
-+		if (!g_str_has_prefix (groups[i], "Session "))
-+			continue;
-+
-+		s = session_new (self->database, groups[i], error);
-+		if (!s)
-+			goto error;
-+
-+		found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user);
-+		if (found) {
-+			session_merge (s, found);
-+			session_free (s);
-+		} else {
-+			/* Entirely new user */
-+			g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s);
-+			g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s);
-+		}
-+	}
-+
-+	g_strfreev (groups);
-+	return TRUE;
-+
-+error:
-+	if (groups)
-+		g_strfreev (groups);
-+	free_database (self);
-+	return FALSE;
-+}
-+
-+static gboolean
-+ensure_database (NMSessionMonitor *self, GError **error)
-+{
-+	gboolean ret = FALSE;
-+
-+	if (self->database != NULL) {
-+		struct stat statbuf;
-+
-+		errno = 0;
-+		if (stat (CKDB_PATH, &statbuf) != 0) {
-+			g_set_error (error,
-+			             NM_SESSION_MONITOR_ERROR,
-+			             errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+			             "Error statting file " CKDB_PATH " to check timestamp: %s",
-+			             strerror (errno));
-+			goto out;
-+		}
-+
-+		if (statbuf.st_mtime == self->database_mtime) {
-+			ret = TRUE;
-+			goto out;
-+		}
-+	}
-+
-+	ret = reload_database (self, error);
-+
-+out:
-+	return ret;
-+}
-+
-+static void
-+on_file_monitor_changed (GFileMonitor *    file_monitor,
-+                         GFile *           file,
-+                         GFile *           other_file,
-+                         GFileMonitorEvent event_type,
-+                         gpointer          user_data)
-+{
-+	NMSessionMonitor *self = NM_SESSION_MONITOR (user_data);
-+
-+	/* throw away cache */
-+	free_database (self);
-+
-+	g_signal_emit (self, signals[CHANGED_SIGNAL], 0);
-+}
-+
- static gboolean
- sessions_changed (gpointer user_data)
- {
-@@ -143,9 +366,50 @@
- static void
- nm_session_monitor_init (NMSessionMonitor *monitor)
- {
--	monitor->sd_source = sd_source_new ();
--	g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--	g_source_attach (monitor->sd_source, NULL);
-+	if (sd_booted () > 0) {
-+		monitor->sd_source = sd_source_new ();
-+		g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+		g_source_attach (monitor->sd_source, NULL);
-+
-+		monitor->database_monitor = NULL;
-+		monitor->database = NULL;
-+	} else {
-+		monitor->sd_source = NULL;
-+
-+		GError *error = NULL;
-+		GFile *file;
-+
-+		/* Sessions-by-user is responsible for destroying the Session objects */
-+		monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal,
-+								NULL, (GDestroyNotify) session_free);
-+		monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal);
-+
-+
-+		error = NULL;
-+		if (!ensure_database (monitor, &error)) {
-+			/* Ignore the first error if the CK database isn't found yet */
-+			if (g_error_matches (error,
-+					     NM_SESSION_MONITOR_ERROR,
-+					     NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) {
-+				nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message);
-+			}
-+			g_error_free (error);
-+		}
-+
-+		error = NULL;
-+		file = g_file_new_for_path (CKDB_PATH);
-+		monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
-+		g_object_unref (file);
-+		if (monitor->database_monitor == NULL) {
-+			nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message);
-+			g_error_free (error);
-+		} else {
-+			g_signal_connect (monitor->database_monitor,
-+					  "changed",
-+					  G_CALLBACK (on_file_monitor_changed),
-+					  monitor);
-+		}
-+	}
- }
- 
- static void
-@@ -158,6 +422,12 @@
- 		g_source_unref (monitor->sd_source);
- 	}
- 
-+	if (monitor->database_monitor != NULL)
-+		g_object_unref (monitor->database_monitor);
-+
-+	if (monitor->database != NULL)
-+		free_database (monitor);
-+
- 	if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
- 		G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object);
- }
-@@ -206,15 +476,36 @@
-                                      uid_t *out_uid,
-                                      GError **error)
- {
--	uid_t uid;
-+	if (monitor->sd_source != NULL) {
-+		uid_t uid;
- 
--	if (!nm_session_user_to_uid (username, &uid, error))
--		return FALSE;
-+		if (!nm_session_user_to_uid (username, &uid, error))
-+			return FALSE;
- 
--	if (out_uid)
--		*out_uid = uid;
-+		if (out_uid)
-+			*out_uid = uid;
- 
--	return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
-+		return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for user '%s'",
-+				     username);
-+			return FALSE;
-+		}
-+
-+		if (out_uid)
-+			*out_uid = s->uid;
-+		return TRUE;
-+	}
- }
- 
- gboolean
-@@ -222,12 +513,31 @@
-                                 const char *username,
-                                 GError **error)
- {
--	uid_t uid;
-+	if (monitor->sd_source != NULL) {
-+		uid_t uid;
- 
--	if (!nm_session_user_to_uid (username, &uid, error))
--		return FALSE;
-+		if (!nm_session_user_to_uid (username, &uid, error))
-+			return FALSE;
-+
-+		return nm_session_monitor_uid_active (monitor, uid, error);
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for user '%s'",
-+				     username);
-+			return FALSE;
-+		}
- 
--	return nm_session_monitor_uid_active (monitor, uid, error);
-+		return s->active;
-+	}
- }
- 
- gboolean
-@@ -236,10 +546,31 @@
-                                     const char **out_user,
-                                     GError **error)
- {
--	if (!nm_session_uid_to_user (uid, out_user, error))
--		return FALSE;
-+	if (monitor->sd_source != NULL) {
-+		if (!nm_session_uid_to_user (uid, out_user, error))
-+			return FALSE;
- 
--	return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+		return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for uid %d",
-+				     uid);
-+			return FALSE;
-+		}
-+
-+		if (out_user)
-+			*out_user = s->user;
-+		return TRUE;
-+	}
- }
- 
- gboolean
-@@ -247,5 +578,24 @@
-                                uid_t uid,
-                                GError **error)
- {
--	return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+	if (monitor->sd_source != NULL)
-+		return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+	else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for uid '%d'",
-+				     uid);
-+			return FALSE;
-+		}
-+
-+		return s->active;
-+	}
- }
diff --git a/testing/networkmanager/systemd-sleep.patch b/testing/networkmanager/systemd-sleep.patch
deleted file mode 100644
index 3470d4654..000000000
--- a/testing/networkmanager/systemd-sleep.patch
+++ /dev/null
@@ -1,616 +0,0 @@
-From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 9 Oct 2012 00:36:35 -0400
-Subject: [PATCH] core: factor out the upower suspend/resume code (bgo
- #677694)
-
-Factor the code that listens for upower sleeping and resuming
-signals out into a class code NMSleepMonitor.
-
-core: add a systemd suspend/resume monitor (bgo #677694)
-
-This implementation uses a delay inhibitor to get systemd to
-emit PrepareForSleep, and then emits ::Sleeping and ::Resuming
-when receiving the before/after PrepareForSleep emissions.
-
-core: DBusGConnections are not GObjects
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2.
-
-core: fix suspend/resume signal names which the manager listens for
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly
-I also thought GObject lower-cased signal names since it munges them
-for - and _ too.  Apparently not.
----
- configure.ac                   |   2 +-
- src/Makefile.am                |   9 +-
- src/nm-manager.c               |  40 +++-----
- src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++
- src/nm-sleep-monitor-upower.c  | 151 ++++++++++++++++++++++++++++
- src/nm-sleep-monitor.h         |  46 +++++++++
- 6 files changed, 437 insertions(+), 28 deletions(-)
- create mode 100644 src/nm-sleep-monitor-systemd.c
- create mode 100644 src/nm-sleep-monitor-upower.c
- create mode 100644 src/nm-sleep-monitor.h
-
-diff --git a/configure.ac b/configure.ac
-index e76e193..9152c23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
- AC_SUBST(GUDEV_CFLAGS)
- AC_SUBST(GUDEV_LIBS)
- 
--PKG_CHECK_MODULES(GIO, gio-2.0)
-+PKG_CHECK_MODULES(GIO, gio-unix-2.0)
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b155209..ba7d2d6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \
- 		nm-session-monitor.h \
- 		nm-session-utils.c \
- 		nm-session-utils.h \
-+		nm-sleep-monitor.h \
- 		nm-connection-provider.h \
- 		nm-connection-provider.c \
- 		nm-dispatcher.c \
-@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
- endif
- 
- if SESSION_TRACKING_SYSTEMD
--NetworkManager_SOURCES += nm-session-monitor-systemd.c
-+NetworkManager_SOURCES += \
-+		nm-session-monitor-systemd.c \
-+		nm-sleep-monitor-systemd.c
- else
- if SESSION_TRACKING_CK
- NetworkManager_SOURCES += nm-session-monitor-ck.c
- else
- NetworkManager_SOURCES += nm-session-monitor-null.c
- endif
-+
-+# UPower suspend/resume used whenever systemd is not enabled
-+NetworkManager_SOURCES += nm-sleep-monitor-upower.c
- endif
- 
- nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
-@@ -283,6 +289,7 @@ BUILT_SOURCES = \
- NetworkManager_CPPFLAGS = \
- 	$(DBUS_CFLAGS) \
- 	$(GLIB_CFLAGS) \
-+	$(GIO_CFLAGS) \
- 	$(GUDEV_CFLAGS) \
- 	$(LIBNL_CFLAGS) \
- 	$(GMODULE_CFLAGS) \
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 618c4ed..c8ce115 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -69,6 +69,7 @@
- #include "nm-device-factory.h"
- #include "wifi-utils.h"
- #include "nm-enum-types.h"
-+#include "nm-sleep-monitor.h"
- 
- #if WITH_CONCHECK
- #include "nm-connectivity.h"
-@@ -78,8 +79,6 @@
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
- #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
- 
--#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
--
- static gboolean impl_manager_get_devices (NMManager *manager,
-                                           GPtrArray **devices,
-                                           GError **err);
-@@ -228,7 +227,7 @@ typedef struct {
- 	guint modem_removed_id;
- 
- 	DBusGProxy *aipd_proxy;
--	DBusGProxy *upower_proxy;
-+	NMSleepMonitor *sleep_monitor;
- 
- 	GSList *auth_chains;
- 
-@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self,
- }
- 
- static void
--upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+sleeping_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal");
- 	_internal_sleep (NM_MANAGER (user_data), TRUE);
- }
- 
- static void
--upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+resuming_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received resuming signal");
- 	_internal_sleep (NM_MANAGER (user_data), FALSE);
- }
- 
-@@ -4049,8 +4048,8 @@ dispose (GObject *object)
- 	if (priv->aipd_proxy)
- 		g_object_unref (priv->aipd_proxy);
- 
--	if (priv->upower_proxy)
--		g_object_unref (priv->upower_proxy);
-+	if (priv->sleep_monitor)
-+		g_object_unref (priv->sleep_monitor);
- 
- 	if (priv->fw_monitor) {
- 		if (priv->fw_monitor_id)
-@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager)
- 	} else
- 		nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy");
- 
--	/* upower sleep/wake handling */
--	priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection,
--	                                                UPOWER_DBUS_SERVICE,
--	                                                "/org/freedesktop/UPower",
--	                                                "org.freedesktop.UPower");
--	if (priv->upower_proxy) {
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping",
--		                             G_CALLBACK (upower_sleeping_cb),
--		                             manager, NULL);
--
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming",
--		                             G_CALLBACK (upower_resuming_cb),
--		                             manager, NULL);
--	} else
--		nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+	/* sleep/wake handling */
-+	priv->sleep_monitor = nm_sleep_monitor_get ();
-+	g_signal_connect (priv->sleep_monitor, "sleeping",
-+	                  G_CALLBACK (sleeping_cb), manager);
-+	g_signal_connect (priv->sleep_monitor, "resuming",
-+	                  G_CALLBACK (resuming_cb), manager);
- 
- 	/* Listen for authorization changes */
- 	nm_auth_changed_func_register (authority_changed_cb, manager);
-diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
-new file mode 100644
-index 0000000..70adc89
---- /dev/null
-+++ b/src/nm-sleep-monitor-systemd.c
-@@ -0,0 +1,217 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include <gio/gunixfdlist.h>
-+
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define SD_NAME              "org.freedesktop.login1"
-+#define SD_PATH              "/org/freedesktop/login1"
-+#define SD_INTERFACE         "org.freedesktop.login1.Manager"
-+
-+
-+struct _NMSleepMonitor {
-+	GObject parent_instance;
-+
-+	GDBusProxy *sd_proxy;
-+	gint inhibit_fd;
-+};
-+
-+struct _NMSleepMonitorClass {
-+	GObjectClass parent_class;
-+
-+	void (*sleeping) (NMSleepMonitor *monitor);
-+	void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+	SLEEPING,
-+	RESUMING,
-+	LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
-+	NMSleepMonitor *self = user_data;
-+	GError *error = NULL;
-+	GVariant *res;
-+	GUnixFDList *fd_list;
-+
-+	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
-+	if (!res) {
-+		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
-+		g_error_free (error);
-+	} else {
-+		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
-+			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
-+
-+		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
-+
-+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
-+		g_object_unref (fd_list);
-+		g_variant_unref (res);
-+	}
-+}
-+
-+static void
-+take_inhibitor (NMSleepMonitor *self)
-+{
-+	g_assert (self->inhibit_fd == -1);
-+
-+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
-+	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
-+	                                     "Inhibit",
-+	                                     g_variant_new ("(ssss)",
-+	                                                    "sleep",
-+	                                                    g_get_user_name (),
-+	                                                    "inhibited",
-+	                                                    "delay"),
-+	                                     0,
-+	                                     G_MAXINT,
-+	                                     NULL,
-+	                                     NULL,
-+	                                     inhibit_done,
-+	                                     self);
-+}
-+
-+static gboolean
-+drop_inhibitor (NMSleepMonitor *self)
-+{
-+	if (self->inhibit_fd >= 0) {
-+		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
-+		close (self->inhibit_fd);
-+		self->inhibit_fd = -1;
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+static void
-+signal_cb (GDBusProxy  *proxy,
-+           const gchar *sendername,
-+           const gchar *signalname,
-+           GVariant    *args,
-+           gpointer     data)
-+{
-+	NMSleepMonitor *self = data;
-+	gboolean is_about_to_suspend;
-+
-+	if (strcmp (signalname, "PrepareForSleep") != 0)
-+		return;
-+
-+	g_variant_get (args, "(b)", &is_about_to_suspend);
-+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
-+
-+	if (is_about_to_suspend) {
-+		g_signal_emit (self, signals[SLEEPING], 0);
-+		drop_inhibitor (self);
-+	} else {
-+		take_inhibitor (self);
-+		g_signal_emit (self, signals[RESUMING], 0);
-+	}
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+	GDBusConnection *bus;
-+
-+	self->inhibit_fd = -1;
-+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
-+	                                        SD_NAME, SD_PATH, SD_INTERFACE,
-+	                                        NULL, NULL);
-+	g_object_unref (bus);
-+	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
-+	take_inhibitor (self);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+	drop_inhibitor (self);
-+	if (self->sd_proxy)
-+		g_object_unref (self->sd_proxy);
-+
-+	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+	GObjectClass *gobject_class;
-+
-+	gobject_class = G_OBJECT_CLASS (klass);
-+
-+	gobject_class->finalize = finalize;
-+
-+	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+	static NMSleepMonitor *singleton = NULL;
-+
-+	if (singleton)
-+		return g_object_ref (singleton);
-+
-+	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+	return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-new file mode 100644
-index 0000000..3c93f66
---- /dev/null
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -0,0 +1,151 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
-+
-+struct _NMSleepMonitor {
-+        GObject parent_instance;
-+
-+        DBusGProxy *upower_proxy;
-+};
-+
-+struct _NMSleepMonitorClass {
-+        GObjectClass parent_class;
-+
-+        void (*sleeping) (NMSleepMonitor *monitor);
-+        void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+        SLEEPING,
-+        RESUMING,
-+        LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+        g_signal_emit (user_data, signals[SLEEPING], 0);
-+}
-+
-+static void
-+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+        g_signal_emit (user_data, signals[RESUMING], 0);
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+        NMDBusManager *dbus_mgr;
-+        DBusGConnection *bus;
-+
-+        dbus_mgr = nm_dbus_manager_get ();
-+        bus = nm_dbus_manager_get_connection (dbus_mgr);
-+        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
-+                                                        UPOWER_DBUS_SERVICE,
-+                                                        "/org/freedesktop/UPower",
-+                                                        "org.freedesktop.UPower");
-+        if (self->upower_proxy) {
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
-+                                             G_CALLBACK (upower_sleeping_cb),
-+                                             self, NULL);
-+
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
-+                                             G_CALLBACK (upower_resuming_cb),
-+                                             self, NULL);
-+        } else
-+                nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+        g_object_unref (dbus_mgr);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+        NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+        if (self->upower_proxy)
-+                g_object_unref (self->upower_proxy);
-+
-+        if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+                G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+        GObjectClass *gobject_class;
-+
-+        gobject_class = G_OBJECT_CLASS (klass);
-+
-+        gobject_class->finalize = finalize;
-+
-+        signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+        signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+        static NMSleepMonitor *singleton = NULL;
-+
-+        if (singleton)
-+                return g_object_ref (singleton);
-+
-+        singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+        return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
-new file mode 100644
-index 0000000..173e6a1
---- /dev/null
-+++ b/src/nm-sleep-monitor.h
-@@ -0,0 +1,46 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#ifndef NM_SLEEP_MONITOR_H
-+#define NM_SLEEP_MONITOR_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define NM_TYPE_SLEEP_MONITOR         (nm_sleep_monitor_get_type ())
-+#define NM_SLEEP_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor))
-+#define NM_SLEEP_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_IS_SLEEP_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR))
-+#define NM_IS_SLEEP_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR))
-+
-+#define NM_SLEEP_MONITOR_SLEEPING "sleeping"
-+#define NM_SLEEP_MONITOR_RESUMING "resuming"
-+
-+typedef struct _NMSleepMonitor         NMSleepMonitor;
-+typedef struct _NMSleepMonitorClass    NMSleepMonitorClass;
-+
-+GType           nm_sleep_monitor_get_type     (void) G_GNUC_CONST;
-+NMSleepMonitor *nm_sleep_monitor_get          (void);
-+
-+G_END_DECLS
-+
-+#endif /* NM_SLEEP_MONITOR_H */
-+
--- 
-1.7.12.2
-
diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD
deleted file mode 100644
index 2392879c2..000000000
--- a/testing/nfs-utils/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 168633 2012-10-13 16:48:28Z thomas $
-# 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.6
-pkgrel=2
-pkgdesc="Support programs for Network File Systems"
-arch=('i686' 'x86_64')
-url='http://nfs.sourceforge.net'
-license=('GPL')
-backup=(etc/{exports,idmapd.conf,nfsmount.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
-	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch
-	rpc-gssd.service
-	rpc-mountd.service
-	rpc-svcgssd.service
-	rpc-idmapd.service
-	rpc-statd.service
-	nfsd.service
-	var-lib-nfs-rpc_pipefs.mount
-	proc-fs-nfsd.mount
-	blkmapd.service
-	nfs-utils.conf)
-install=nfs-utils.install
-md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
-         'dd0d65fc6e8f422fa12520813098264b'
-         'f73f197a16b02c3e248488ec35c4cf43'
-         'e619f18354ff958ed624d05d08853d8f'
-         '9cef69bc686cc5dcac23fbb51450747d'
-         'ff585faf410a62c4333a027c50b56bae'
-         'eb4f4027fab6fc1201f1ca04f5954c76'
-         'e9144277a89a620d9bc80413158a7d27'
-         'f5e7bba09a46c5c5d7007cac6eff9df5'
-         '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2'
-         '3694619813cebc5b4502b58f1992b442'
-         '965311784d49a7d126d512cadbe91deb'
-         'e05705d9ccccaeaeb1ecaee20adc05bc'
-         '359d84a85f8781dc3f45f4cf1dbe4b53'
-         'c82ef7b238efe62af3d5e263e1ba1c5c'
-         '5d33d2e754fd37280365b287603bac90'
-         '1cd65909fa0983047f3f06a3ab352401'
-         '02a34835aa077146a90eb7d191e612d0'
-         '8ffc2ebe932d29efe17d6f3f23d5b975'
-         '8ac484023d786766d287ccbe878ae4ba')
-
-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-nfsv4 --enable-nfsv41 --enable-gss \
-              --without-tcp-wrappers --with-statedir=/var/lib/nfs \
-              --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
-              --enable-mountconfig
-
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-  # fix make install
-  mkdir -p $pkgdir/sbin
-  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
-  install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
-  install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
-  # systemd files
-  for i in ${srcdir}/*.{service,mount}; do
-    install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
-  done
-  install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.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/blkmapd.service b/testing/nfs-utils/blkmapd.service
deleted file mode 100644
index 16cb68bbb..000000000
--- a/testing/nfs-utils/blkmapd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=pNFS block layout mapping daemon
-After=var-lib-nfs-rpc_pipefs.mount nfsd.service
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/blkmapd
-
-[Install]
-WantedBy=multi-user.target
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/nfs b/testing/nfs-utils/nfs
deleted file mode 100644
index 2d33cf3d4..000000000
--- a/testing/nfs-utils/nfs
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Optinal options passed to rquotad
-RPCRQUOTADOPTS=""
-#
-# Optional arguments passed to in-kernel lockd
-#LOCKDARG=
-# TCP port rpc.lockd should listen on.
-#LOCKD_TCPPORT=32803
-# UDP port rpc.lockd should listen on.
-#LOCKD_UDPPORT=32769
-#
-# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
-RPCNFSDARGS=""
-# Number of nfs server processes to be started.
-# The default is 8. 
-RPCNFSDCOUNT=8
-# Set V4 grace period in seconds
-#NFSD_V4_GRACE=90
-#
-# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
-RPCMOUNTDOPTS=""
-#
-# Optional arguments passed to rpc.statd. See rpc.statd(8)
-STATDARG=""
-#
-# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
-RPCIDMAPDARGS=""
-#
-# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
-RPCGSSDARGS=""
-#
-# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
-RPCSVCGSSDARGS=""
-#
-# To enable RDMA support on the server by setting this to
-# the port the server should listen on
-#RDMA_PORT=20049 
-#
-# Optional arguments passed to blkmapd. See blkmapd(8)
-BLKMAPDARGS=""
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 581e26350..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=""
-
-# 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.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.conf b/testing/nfs-utils/nfs-utils.conf
deleted file mode 100644
index 33c97b838..000000000
--- a/testing/nfs-utils/nfs-utils.conf
+++ /dev/null
@@ -1 +0,0 @@
-nfs
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/nfsd.service b/testing/nfs-utils/nfsd.service
deleted file mode 100644
index e5481c3d1..000000000
--- a/testing/nfs-utils/nfsd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/proc-fs-nfsd.mount b/testing/nfs-utils/proc-fs-nfsd.mount
deleted file mode 100644
index f8664a8be..000000000
--- a/testing/nfs-utils/proc-fs-nfsd.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System 
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=rpc_pipefs
diff --git a/testing/nfs-utils/rpc-gssd.service b/testing/nfs-utils/rpc-gssd.service
deleted file mode 100644
index da4c71307..000000000
--- a/testing/nfs-utils/rpc-gssd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC GSS-API client-side daemon
-After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-idmapd.service b/testing/nfs-utils/rpc-idmapd.service
deleted file mode 100644
index 7785c1bd5..000000000
--- a/testing/nfs-utils/rpc-idmapd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFSv4 ID-name mapping daemon
-After=var-lib-nfs-rpc_pipefs.mount nfsd.service
-Requires=var-lib-nfs-rpc_pipefs.mount
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-mountd.service b/testing/nfs-utils/rpc-mountd.service
deleted file mode 100644
index edd8c851d..000000000
--- a/testing/nfs-utils/rpc-mountd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-statd.service b/testing/nfs-utils/rpc-statd.service
deleted file mode 100644
index 97d397faf..000000000
--- a/testing/nfs-utils/rpc-statd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.statd $STATD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-svcgssd.service b/testing/nfs-utils/rpc-svcgssd.service
deleted file mode 100644
index 8152e8338..000000000
--- a/testing/nfs-utils/rpc-svcgssd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=RPC GSS-API server-side daemon
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS
-
-[Install]
-WantedBy=multi-user.target
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/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount
deleted file mode 100644
index 4bd440f24..000000000
--- a/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=RPC pipe filesystem
-
-[Mount]
-What=rpc_pipefs
-Where=/var/lib/nfs/rpc_pipefs
-Type=rpc_pipefs
diff --git a/testing/nfsidmap/PKGBUILD b/testing/nfsidmap/PKGBUILD
deleted file mode 100644
index 17f3e5580..000000000
--- a/testing/nfsidmap/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 166728 2012-09-17 05:20:12Z tpowa $
-# Maintainer: 
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=nfsidmap
-pkgver=0.25
-pkgrel=1
-pkgdesc="Library to help mapping IDs, mainly for NFSv4"
-arch=('i686' 'x86_64')
-url="http://www.citi.umich.edu/projects/nfsv4/linux/"
-depends=('glibc' 'libldap>=2.4.18')
-license=('custom:nfsidmap')
-options=(!libtool)
-source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz)
-
-build() {
-  cd $srcdir/lib$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $srcdir/lib$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE
-}
-md5sums=('2ac4893c92716add1a1447ae01df77ab')
diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD
deleted file mode 100644
index c6db2bbf4..000000000
--- a/testing/nilfs-utils/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 163179 2012-07-08 13:36:38Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=nilfs-utils
-pkgver=2.1.4
-pkgrel=1
-pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
-arch=('i686' 'x86_64')
-url="http://www.nilfs.org/"
-license=('GPL2' 'LGPL2.1')
-backup=('etc/nilfs_cleanerd.conf')
-depends=('util-linux')
-options=(!libtool)
-source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('e72f941f5041a057a81a1ce22e03497d')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --enable-libmount
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
-}
diff --git a/testing/nouveau-dri/LICENSE b/testing/nouveau-dri/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/testing/nouveau-dri/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/testing/nouveau-dri/PKGBUILD b/testing/nouveau-dri/PKGBUILD
deleted file mode 100644
index 3517ef0fa..000000000
--- a/testing/nouveau-dri/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 163959 2012-07-22 18:51:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nouveau-dri
-pkgver=8.0.4
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
-             'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(LICENSE
-        mesa-8.0.3-llvm-3.1-fixes.patch
-        ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-)
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'c452ed3392468170726c004c2f4e02ca'
-         'd546f988adfdf986cff45b1efa2d8a46')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-    patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
-     autoreconf -vfi
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=nouveau \
-    --with-dri-drivers=nouveau \
-    --enable-gallium-llvm \
-    --enable-gallium-egl \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore
-  make
-}
-
-package() {
-  depends=("libgl=${pkgver}" 'libdrm-nouveau1')
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch b/testing/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/testing/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/testing/nspr/PKGBUILD b/testing/nspr/PKGBUILD
deleted file mode 100644
index e5444b75c..000000000
--- a/testing/nspr/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 161981 2012-06-17 22:56:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=nspr
-pkgver=4.9.1
-pkgrel=1
-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=('d36d7b65a38f5b43ebd50ad3ad227120'
-         '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/nss-myhostname/PKGBUILD b/testing/nss-myhostname/PKGBUILD
deleted file mode 100644
index 18b582043..000000000
--- a/testing/nss-myhostname/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169556 2012-10-23 14:16:38Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Mantas M. <grawity@gmail.com>
-pkgname="nss-myhostname"
-pkgver=0.3
-pkgrel=3
-pkgdesc="NSS plugin providing host name resolution for the locally configured system hostname"
-arch=(i686 x86_64)
-url="http://0pointer.de/lennart/projects/nss-myhostname/"
-license=('LGPL2.1')
-depends=('glibc')
-groups=('base')
-source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-lynx
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-md5sums=('d4ab9ac36c053ab8fb836db1cbd4a48f')
diff --git a/testing/nss/PKGBUILD b/testing/nss/PKGBUILD
deleted file mode 100644
index 69c4847df..000000000
--- a/testing/nss/PKGBUILD
+++ /dev/null
@@ -1,106 +0,0 @@
-# $Id: PKGBUILD 161983 2012-06-17 23:04:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nss
-pkgver=3.13.5
-pkgrel=1
-pkgdesc="Mozilla Network Security Services"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/security/pki/nss/"
-license=('MPL' 'GPL')
-_nsprver=4.9.1
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
-makedepends=('perl')
-options=('!strip')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
-        nss-no-rpath.patch
-        nss.pc.in
-        nss-config.in
-        add_spi+cacert_ca_certs.patch
-        ssl-renegotiate-transitional.patch)
-sha1sums=('22cfe2cbccc93189699e6eed283eca288b45f6cb'
-          'c8fcdb153af9d39689243119adb475905a657284'
-          'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
-          'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
-          '3d89f29e321d7df7269b7ae6d219654543feaa6a'
-          '8a964a744ba098711b80c0d279a2993524e8eb92')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
-  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
-  patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
-  # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
-  # Removes rpath
-  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
-
-  # Respect LDFLAGS
-  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
-      -i security/coreconf/rules.mk
-
-  # Generate certdata.c from certdata.txt
-  cd security/nss/lib/ckfw/builtins
-  make generate
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export BUILD_OPT=1
-  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-  export NSS_USE_SYSTEM_SQLITE=1
-  export NSS_ENABLE_ECC=1
-  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
-  export XCFLAGS="${CFLAGS}"
-
-  [ "$CARCH" = "x86_64" ] && export USE_64=1
-
-  make -j 1 -C mozilla/security/coreconf
-  make -j 1 -C mozilla/security/dbm
-  make -j 1 -C mozilla/security/nss
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/include/nss"
-
-  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-
-  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
-  				-e "s,%prefix%,/usr,g" \
-				-e "s,%exec_prefix%,/usr/bin,g" \
-				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${pkgver},g" \
-				-e "s,%NSS_VERSION%,${pkgver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
-
-  sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
-  				    -e "s,@prefix@,/usr/bin,g" \
-				    -e "s,@exec_prefix@,/usr/bin,g" \
-				    -e "s,@includedir@,/usr/include/nss,g" \
-				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config"
-  chmod 755 "${pkgdir}/usr/bin/nss-config"
-
-  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
-              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
-  do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
-  done
-
-  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
-  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
-
-  for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
-  done
-
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
-}
diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch
deleted file mode 100644
index bf7e2ca16..000000000
--- a/testing/nss/add_spi+cacert_ca_certs.patch
+++ /dev/null
@@ -1,568 +0,0 @@
-## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds the SPI Inc. and CAcert.org CA certificates
-
-Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:32:14.000000000 +0100
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:35:07.577861466 +0100
-@@ -23475,3 +23475,558 @@
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+ 
-+#
-+# Certificate "CAcert.org Class 1 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
-+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
-+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
-+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
-+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
-+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
-+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
-+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
-+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
-+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
-+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
-+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
-+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
-+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
-+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
-+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
-+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
-+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
-+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
-+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
-+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
-+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
-+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
-+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
-+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
-+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
-+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
-+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
-+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
-+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
-+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
-+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
-+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
-+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
-+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
-+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
-+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
-+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
-+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
-+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
-+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
-+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
-+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
-+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
-+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
-+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
-+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
-+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
-+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
-+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
-+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
-+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
-+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
-+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
-+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
-+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
-+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
-+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
-+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
-+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
-+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
-+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
-+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
-+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
-+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
-+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
-+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
-+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
-+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
-+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
-+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
-+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
-+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
-+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
-+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
-+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
-+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
-+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
-+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
-+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
-+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
-+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
-+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
-+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
-+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
-+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
-+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
-+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
-+\103
-+END
-+
-+# Trust for Certificate "CAcert.org Class 1 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
-+\166\316\217\063
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 3 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
-+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
-+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
-+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
-+\063\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
-+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
-+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
-+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
-+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
-+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
-+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
-+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
-+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
-+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
-+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
-+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
-+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
-+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
-+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
-+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
-+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
-+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
-+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
-+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
-+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
-+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
-+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
-+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
-+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
-+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
-+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
-+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
-+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
-+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
-+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
-+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
-+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
-+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
-+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
-+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
-+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
-+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
-+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
-+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
-+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
-+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
-+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
-+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
-+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
-+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
-+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
-+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
-+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
-+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
-+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
-+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
-+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
-+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
-+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
-+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
-+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
-+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
-+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
-+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
-+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
-+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
-+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
-+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
-+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
-+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
-+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
-+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
-+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
-+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
-+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
-+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
-+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
-+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
-+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
-+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
-+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
-+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
-+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
-+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
-+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
-+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
-+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
-+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
-+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
-+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
-+\322\156\245\033\231\047\200\347\013\251\250\000
-+END
-+
-+# Trust for Certificate "CAcert.org Class 3 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
-+\030\116\052\055
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
-+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
-+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
-+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
-+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
-+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
-+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
-+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
-+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
-+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
-+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
-+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
-+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
-+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
-+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
-+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
-+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
-+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
-+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
-+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
-+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
-+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
-+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
-+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
-+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
-+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
-+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
-+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
-+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
-+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
-+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
-+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
-+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
-+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
-+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
-+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
-+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
-+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
-+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
-+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
-+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
-+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
-+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
-+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
-+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
-+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
-+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
-+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
-+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
-+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
-+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
-+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
-+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
-+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
-+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
-+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
-+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
-+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
-+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
-+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
-+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
-+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
-+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
-+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
-+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
-+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
-+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
-+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
-+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
-+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
-+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
-+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
-+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
-+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
-+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
-+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
-+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
-+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
-+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
-+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
-+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
-+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
-+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
-+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
-+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
-+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
-+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
-+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
-+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
-+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
-+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
-+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
-+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
-+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
-+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
-+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
-+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
-+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
-+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
-+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
-+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
-+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
-+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
-+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
-+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
-+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
-+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
-+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
-+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
-+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
-+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
-+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
-+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
-+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
-+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
-+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
-+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
-+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
-+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
-+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
-+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
-+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
-+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
-+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
-+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
-+\243\140
-+END
-+
-+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
-+\251\220\103\034
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in
deleted file mode 100644
index f8f893e71..000000000
--- a/testing/nss/nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
-	cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Dynamic Libraries:
-	nss
-	nssutil
-	ssl
-	smime
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    ssl)
-      lib_ssl=yes
-      ;;
-    smime)
-      lib_smime=yes
-      ;;
-    nss)
-      lib_nss=yes
-      ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
-fi
-if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
-      fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
-      fi
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
-      fi
-      echo $libdirs
-fi      
-
diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch
deleted file mode 100644
index 35ea57315..000000000
--- a/testing/nss/nss-no-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
-+++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
-@@ -52,9 +52,9 @@
- 
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
- endif
- endif
- 
diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in
deleted file mode 100644
index d47b9e146..000000000
--- a/testing/nss/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch
deleted file mode 100644
index f457c5551..000000000
--- a/testing/nss/ssl-renegotiate-transitional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable transitional scheme for ssl renegotiation:
-
-(from mozilla/security/nss/lib/ssl/ssl.h)
-Disallow unsafe renegotiation in server sockets only, but allow clients
-to continue to renegotiate with vulnerable servers.
-This value should only be used during the transition period when few
-servers have been upgraded.
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
-index f1d1921..c074360 100644
---- a/mozilla/security/nss/lib/ssl/sslsock.c
-+++ b/mozilla/security/nss/lib/ssl/sslsock.c
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
-     PR_FALSE,   /* noLocks            */
-     PR_FALSE,   /* enableSessionTickets */
-     PR_FALSE,   /* enableDeflate      */
--    2,          /* enableRenegotiation (default: requires extension) */
-+    3,          /* enableRenegotiation (default: transitional) */
-     PR_FALSE,   /* requireSafeNegotiation */
- };
- 
diff --git a/testing/ntp/PKGBUILD b/testing/ntp/PKGBUILD
deleted file mode 100644
index 1266d8304..000000000
--- a/testing/ntp/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 161933 2012-06-16 17:15:59Z dreisner $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-
-pkgname=ntp
-pkgver=4.2.6.p5
-_realver=4.2.6p5
-pkgrel=7
-pkgdesc='Network Time Protocol reference implementation'
-url='http://www.ntp.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-makedepends=('perl-html-parser')
-depends=('openssl' 'readline' 'libcap')
-backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf')
-source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
-        'ntpd'
-        'ntpdate'
-        'ntp.conf'
-        'ntpd.conf'
-        'logrotate.d'
-        'ntpd.service')
-sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
-          '4e324e625c1f080b5c028be5092aa71adbf9bd99'
-          '01394b8a952f5edc85d19df8335eeac3980320f4'
-          'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
-          '4537d1f58b299d463db5048129cb264511474b0b'
-          '4f76f7f9ffc8315ff9924f793f272d4f6939b816'
-          '81df5c4d51cb69bc29363625ff49e2bd388d1fa9')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${_realver}"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-linuxcaps \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-$_realver"
-
-	make DESTDIR="${pkgdir}" install
-
-	rmdir "${pkgdir}"/usr/{lib,sbin}
-	install -d -o 87 "${pkgdir}"/var/lib/ntp
-	install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
-	install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
-	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
-	install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf
-	install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd
-	install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	
-	cd html
-	../scripts/html2man
-	install -d "${pkgdir}"/usr/share/man
-	mv man/man* "${pkgdir}"/usr/share/man
-	mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
-}
diff --git a/testing/ntp/install b/testing/ntp/install
deleted file mode 100644
index e6eddf8a4..000000000
--- a/testing/ntp/install
+++ /dev/null
@@ -1,37 +0,0 @@
-post_install() {
-	getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
-	getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
-	true
-}
-
-post_upgrade() {
-	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
-		cat <<EOF
-
-==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
-==> If you made changes to the former, please update the latter.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
-		cat <<EOF
-
-==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
-==> and the new rc.d script only takes the latter into account.
-==> To stop your old ntpd process, please kill it manually.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
-		post_install
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
-		chown -R ntp /var/lib/ntp
-	fi
-}
-
-post_remove() {
-	getent passwd ntp &>/dev/null && userdel ntp >/dev/null
-	getent group ntp &>/dev/null && groupdel ntp >/dev/null
-	true
-}
diff --git a/testing/ntp/logrotate.d b/testing/ntp/logrotate.d
deleted file mode 100644
index 8a9f066c3..000000000
--- a/testing/ntp/logrotate.d
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/ntp.log {
-	missingok
-	copytruncate
-}
diff --git a/testing/ntp/ntp.conf b/testing/ntp/ntp.conf
deleted file mode 100644
index a27b22820..000000000
--- a/testing/ntp/ntp.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# With the default settings below, ntpd will only synchronize your clock.
-#
-# For details, see:
-# - the ntp.conf man page
-# - http://support.ntp.org/bin/view/Support/GettingStarted
-# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
-
-# Associate to public NTP pool servers; see http://www.pool.ntp.org/
-server 0.pool.ntp.org
-server 1.pool.ntp.org
-server 2.pool.ntp.org
-
-# Only allow read-only access from localhost
-restrict default noquery nopeer
-restrict 127.0.0.1
-restrict ::1
-
-# Location of drift and log files
-driftfile /var/lib/ntp/ntp.drift
-logfile /var/log/ntp.log
-
-# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing
-# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net
diff --git a/testing/ntp/ntpd b/testing/ntp/ntpd
deleted file mode 100755
index 480fa1088..000000000
--- a/testing/ntp/ntpd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-unset PID
-PIDFILE='/run/ntpd.pid'
-
-if [[ -r ${PIDFILE} ]]; then
-	read -r PID <"${PIDFILE}"
-	if [[ -n ${PID} && ! -d /proc/${PID} ]]; then
-		rm -f "${PIDFILE}"
-		unset PID
-	fi
-fi
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Daemon"
-		if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then 
-			add_daemon ntpd
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Daemon"
-		if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then
-			rm ${PIDFILE}
-			rm_daemon ntpd
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/ntp/ntpd.conf b/testing/ntp/ntpd.conf
deleted file mode 100644
index 047961fde..000000000
--- a/testing/ntp/ntpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g -u ntp"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g -u ntp"
diff --git a/testing/ntp/ntpd.service b/testing/ntp/ntpd.service
deleted file mode 100644
index e0cbf879e..000000000
--- a/testing/ntp/ntpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Network Time Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/ntpd.pid
-EnvironmentFile=/etc/conf.d/ntpd.conf
-ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ntp/ntpdate b/testing/ntp/ntpdate
deleted file mode 100755
index a8e746785..000000000
--- a/testing/ntp/ntpdate
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Client"
-		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
-			add_daemon ntpdate
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Client"
-		rm_daemon ntpdate
-		stat_done
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/nx/PKGBUILD b/testing/nx/PKGBUILD
deleted file mode 100644
index bc2247597..000000000
--- a/testing/nx/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# $Id: PKGBUILD 168322 2012-10-08 18:52:28Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.15
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/"
-license=('GPL')
-options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
-             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
-             )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
-        nx-x11.ld.so.conf.d
-        nx-cflags.patch)
-md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
-         'f2ec60c7e2d81bef2f7292d2b33681a6'
-         'd0c5b88aac0473e19699cf62d84b9d5f')
-
-build() {
-  cd "${srcdir}/nx-libs-$pkgver"
-  
-  # debug flags
-#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
-#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
-
-  # Gentoo hacks to honor cflags
-  patch -Np0 -i ${srcdir}/nx-cflags.patch
-
-  # Run autoreconf in all neeed folders
-  for i in nxcomp nxcompext nxcompshad nxproxy; do
-     cd ${i}
-     autoreconf -vfi #${i}
-     cd ..
-  done
-  
-  # From xorg-x11-6.9.0-r3.ebuild
-  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
-
-  HOSTCONF="config/cf/host.def"
-  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  # Respect LDFLAGS
-  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-  popd
-    
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-	
-  install -dm755 ${pkgdir}/usr/lib/nx/lib
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxproxy .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-	
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
-  ln -sv libXcompext.so.3.5.0 libXcompext.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-	
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
-
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxauth .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxauth
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
-	
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxagent .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxagent
-  # required nxcompshad libs
-  cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
-}
-
-package_nx-headers() {
-
-  pkgdesc="NX headers"
-  
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  
diff --git a/testing/nx/nx-cflags.patch b/testing/nx/nx-cflags.patch
deleted file mode 100644
index 35562939c..000000000
--- a/testing/nx/nx-cflags.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- nxcomp/configure.in.orig	2008-12-18 15:48:09.000000000 +0100
-+++ nxcomp/configure.in	2008-12-18 15:54:14.000000000 +0100
-@@ -7,8 +7,7 @@
- 
- dnl Set our default compilation flags.
- 
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
- 
- dnl Reset default linking directives.
- 
---- nxcompext/configure.in.orig	2008-12-18 15:55:29.000000000 +0100
-+++ nxcompext/configure.in	2008-12-18 15:55:51.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(NXlib.h)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CFLAGS="-O3"
--
- dnl Reset default linking directives.
- 
- LIBSTATIC=""
---- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
-+++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Shadow.h)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Reset default linking directives.
- 
- LIBSTATIC=""
---- nxproxy/configure.in.orig	2008-12-18 15:57:48.000000000 +0100
-+++ nxproxy/configure.in	2008-12-18 15:57:55.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Main.c)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Prefer headers and libraries from nx-X11 if present.
- 
- if test -d "../nx-X11/exports/include" ; then
diff --git a/testing/nx/nx-x11.ld.so.conf.d b/testing/nx/nx-x11.ld.so.conf.d
deleted file mode 100644
index 5d15cb6e2..000000000
--- a/testing/nx/nx-x11.ld.so.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/nx/
diff --git a/testing/obex-data-server/PKGBUILD b/testing/obex-data-server/PKGBUILD
deleted file mode 100644
index 2ab25c6b1..000000000
--- a/testing/obex-data-server/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169644 2012-10-25 01:35:28Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Keerthi <keerthi.linux@gmail.com>
-
-pkgname=obex-data-server
-pkgver=0.4.6
-pkgrel=3
-pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
-arch=('i686' 'x86_64')
-url="http://wiki.muiline.com/obex-data-server"
-license=('GPL')
-depends=('dbus-glib' 'openobex' 'imagemagick')
-source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz")
-md5sums=('961ca5db6fe9c97024e133cc6203cc4d')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/octave/PKGBUILD b/testing/octave/PKGBUILD
deleted file mode 100644
index cc4149860..000000000
--- a/testing/octave/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 168503 2012-10-12 21:20:37Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : shining <shiningxc.at.gmail.com>
-# Contributor : cyberdune <cyberdune@gmail.com>
-
-pkgname=octave
-pkgver=3.6.2
-pkgrel=2
-pkgdesc="A high-level language, primarily intended for numerical computations."
-arch=('i686' 'x86_64')
-url="http://www.octave.org"
-license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core')
-optdepends=('texinfo: for help-support in octave'
-            'gnuplot: alternative plotting')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2"
-        buildfix.diff
-        octave-gethelp.patch)
-options=('!emptydirs')
-install=octave.install
-sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7'
-          'a7cdba1e05fbdd182facdd804aeec37729255551'
-          'd39d54763ac86114029f8bc5d60763d2adce27bb')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # patch by Gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log
-  patch -Np0 -i ${srcdir}/buildfix.diff
-  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log
-  patch -Np0 -i ${srcdir}/octave-gethelp.patch
-
-  autoreconf -vfi
-
-  # http://www.nabble.com/Random-rounding-errors-td16010966.html
-  FFLAGS="-O -ffloat-store" \
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static \
-  --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
-
-  LANG=C make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-
-  # add octave library path to ld.so.conf.d
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/${pkgname}/${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-}
diff --git a/testing/octave/buildfix.diff b/testing/octave/buildfix.diff
deleted file mode 100644
index 8288b7bec..000000000
--- a/testing/octave/buildfix.diff
+++ /dev/null
@@ -1,85 +0,0 @@
---- libgnu/stdio.in.h.origs	2012-05-24 12:46:13.000000000 -0600
-+++ libgnu/stdio.in.h	2012-05-24 16:29:54.813734894 -0600
-@@ -1,12 +1,10 @@
--/* -*- buffer-read-only: t -*- vi: set ro: */
--/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
- /* A GNU-like <stdio.h>.
- 
-    Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.
- 
-    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 3, or (at your option)
-+   the Free Software Foundation; either version 2, or (at your option)
-    any later version.
- 
-    This program is distributed in the hope that it will be useful,
-@@ -15,8 +13,7 @@
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
--   along with this program; if not, write to the Free Software Foundation,
--   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
- 
- #if __GNUC__ >= 3
- @PRAGMA_SYSTEM_HEADER@
-@@ -55,7 +52,8 @@
- #include <stddef.h>
- 
- /* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
--   and eglibc 2.11.2.  */
-+   and eglibc 2.11.2.
-+   May also define off_t to a 64-bit type on native Windows.  */
- #include <sys/types.h>
- 
- /* The __attribute__ feature is available in gcc versions 2.5 and later.
-@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
-@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose);
- #elif defined GNULIB_POSIXCHECK
- # undef pclose
- # if HAVE_RAW_DECL_PCLOSE
--_GL_WARN_ON_USE (pclose, "popen is unportable - "
-+_GL_WARN_ON_USE (pclose, "pclose is unportable - "
-                  "use gnulib module pclose for more portability");
- # endif
- #endif
-@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is
- # endif
- #endif
- 
--/* Some people would argue that sprintf should be handled like gets
--   (for example, OpenBSD issues a link warning for both functions),
--   since both can cause security holes due to buffer overruns.
-+/* Some people would argue that all sprintf uses should be warned about
-+   (for example, OpenBSD issues a link warning for it),
-+   since it can cause security holes due to buffer overruns.
-    However, we believe that sprintf can be used safely, and is more
-    efficient than snprintf in those safe cases; and as proof of our
-    belief, we use sprintf in several gnulib modules.  So this header
diff --git a/testing/octave/curlfix.patch b/testing/octave/curlfix.patch
deleted file mode 100644
index 26f3d92f9..000000000
--- a/testing/octave/curlfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DLD-FUNCTIONS/urlwrite.cc.old	2011-07-02 16:39:22.466603778 +0200
-+++ src/DLD-FUNCTIONS/urlwrite.cc	2011-07-02 16:39:54.543269859 +0200
-@@ -52,7 +52,6 @@
- 
- #include <curl/curl.h>
- #include <curl/curlver.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- static int
diff --git a/testing/octave/imread.patch b/testing/octave/imread.patch
deleted file mode 100644
index 4a7b73ea0..000000000
--- a/testing/octave/imread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/DLD-FUNCTIONS/__magick_read__.cc.orig	2010-03-06 08:05:25.000000000 +0000
-+++ src/DLD-FUNCTIONS/__magick_read__.cc	2009-08-25 09:26:01.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "defun-dld.h"
- #include "error.h"
- #include "ov-struct.h"
-+#include "oct-env.h"
- 
- #ifdef HAVE_MAGICK
- 
-@@ -359,6 +358,18 @@
- 
- #ifdef HAVE_MAGICK
- 
-+  static bool initialized = false;
-+
-+  if (! initialized)
-+    {
-+      std::string program_name = octave_env::get_program_invocation_name ();
-+
-+      Magick::InitializeMagick (program_name.c_str ());
-+
-+      initialized = true;
-+    }
-+
-+
-   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
-       || nargout > 3)
-     {
diff --git a/testing/octave/octave-3.4.0-gcc46.patch b/testing/octave/octave-3.4.0-gcc46.patch
deleted file mode 100644
index c174204ac..000000000
--- a/testing/octave/octave-3.4.0-gcc46.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h
---- octave-3.4.0/liboctave/oct-alloc.h.gcc46	2011-02-08 03:00:51.000000000 -0700
-+++ octave-3.4.0/liboctave/oct-alloc.h	2011-02-08 09:41:23.984081687 -0700
-@@ -23,6 +23,8 @@ along with Octave; see the file COPYING.
- #if !defined (octave_oct_alloc_h)
- #define octave_oct_alloc_h 1
- 
-+#include <cstddef>
-+
- class
- OCTAVE_API
- octave_allocator
-diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc
---- octave-3.4.0/src/pr-output.cc.gcc46	2011-02-08 03:00:52.000000000 -0700
-+++ octave-3.4.0/src/pr-output.cc	2011-02-08 09:55:16.149662744 -0700
-@@ -3024,7 +3024,7 @@ abs (T x)
- }
- 
- #define INSTANTIATE_ABS(T) \
--  template /* static */ inline T abs (T)
-+  template /* static */ T abs (T)
- 
- INSTANTIATE_ABS(signed char);
- INSTANTIATE_ABS(short);
diff --git a/testing/octave/octave-gethelp.patch b/testing/octave/octave-gethelp.patch
deleted file mode 100644
index c0e693abc..000000000
--- a/testing/octave/octave-gethelp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Help parallel compilation
-patch by Sebastien Fabbro 
---- scripts/Makefile.am.orig	2011-06-09 22:27:22.688268651 +0100
-+++ scripts/Makefile.am	2011-02-08 10:00:51.000000000 +0000
-@@ -316,7 +316,7 @@
- 
- gethelp_SOURCES = gethelp.cc
- 
--.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile
-+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp
- 	@$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT)
- 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
- 		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
diff --git a/testing/octave/octave.install b/testing/octave/octave.install
deleted file mode 100644
index 8ee77c430..000000000
--- a/testing/octave/octave.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=/usr/share/info
-info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD
deleted file mode 100644
index 962a5aae5..000000000
--- a/testing/opal/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169547 2012-10-23 12:23:23Z jgc $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-pkgname=opal
-pkgver=3.10.7
-pkgrel=2
-pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64)
-url="http://www.opalvoip.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm')
-makedepends=('ffmpeg')
-options=(!makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2
-        opal-ffmpeg.patch)
-md5sums=('8686bb930668067eefadab115d2ee1c2'
-         '0f05c01dada644b37805667ba9e81aa5')
-
-build() {
-  cd "${srcdir}/opal-${pkgver}"
-  patch -Np1 -i "${srcdir}/opal-ffmpeg.patch"
-  CXXFLAGS="$CXXFLAGS -fpermissive" \
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/opal-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  chmod 644 "${pkgdir}/usr/lib/libopal_s.a"
-}
diff --git a/testing/opal/opal-ffmpeg.patch b/testing/opal/opal-ffmpeg.patch
deleted file mode 100644
index c40e1ddfb..000000000
--- a/testing/opal/opal-ffmpeg.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx	2012-08-23 04:18:42.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-08-28 19:53:12.080918973 +0200
-@@ -48,6 +48,7 @@
- #endif
- 
- #include "h263-1998.h"
-+#include <libavutil/opt.h>
- #include <limits>
- #include <iomanip>
- #include <stdio.h>
-@@ -317,9 +318,9 @@
-     // Level 2+ 
-     // works with eyeBeam, signaled via  non-standard "D"
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-     return;
-   }
- 
-@@ -328,9 +329,9 @@
-     // Annex F: Advanced Prediction Mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
-     return;
-   }
- #endif
-@@ -360,9 +361,9 @@
-     // Annex K: Slice Structure
-     // does not work with eyeBeam
-     if (atoi(value) != 0)
--      m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
-     return;
-   }
- 
-@@ -370,9 +371,9 @@
-     // Annex S: Alternative INTER VLC mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-     return;
-   }
- 
-@@ -450,15 +451,6 @@
-   PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
-   PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
- 
--  #define CODEC_TRACER_FLAG(tracer, flag) \
--    PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
--
-   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
- }
- 
-@@ -521,7 +513,7 @@
- 
-     // Need to copy to local buffer to guarantee 16 byte alignment
-     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
--    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-+    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
- 
-     /*
-     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -603,13 +595,13 @@
-   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
-   m_context->opaque = this; // used to separate out packets from different encode threads
- 
--  m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+  av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-   m_context->flags &= ~CODEC_FLAG_4MV;
- #if LIBAVCODEC_RTP_MODE
-   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
- #endif
--  m_context->flags &= ~CODEC_FLAG_H263P_AIV;
--  m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+  av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-+  av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
- 
-   return true;
- }
-Only in opal-3.10.7.patched/plugins/video/H.263-1998: h263-1998.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-28 19:53:12.080918973 +0200
-@@ -27,6 +27,7 @@
- #include <fstream>
- #include <stdlib.h> 
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-Only in opal-3.10.7.patched/plugins/video/H.264/gpl: h264_helper.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.7/plugins/video/H.264/h264-x264.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx	2012-08-28 19:53:12.080918973 +0200
-@@ -1071,13 +1071,10 @@
-         return false;
- 
-       m_context->workaround_bugs = FF_BUG_AUTODETECT;
--      m_context->error_recognition = FF_ER_AGGRESSIVE;
-       m_context->idct_algo = FF_IDCT_H264;
-       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
-       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
--      m_context->flags2 = CODEC_FLAG2_BRDO |
--                          CODEC_FLAG2_MEMC_ONLY |
--                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
-+      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
-                           CODEC_FLAG2_SKIP_RD |
-                           CODEC_FLAG2_CHUNKS;
- 
-Only in opal-3.10.7.patched/plugins/video/H.264: h264-x264.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-08-28 19:53:12.084252306 +0200
-@@ -33,6 +33,7 @@
- 
- #include <codec/opalplugin.hpp>
- #include <stdio.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-Only in opal-3.10.7.patched/plugins/video/H.264/shared: x264wrap.cxx.orig
-diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-23 04:18:44.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-28 19:54:35.460923804 +0200
-@@ -103,6 +103,7 @@
- 
- #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include "../common/ffmpeg.h"
-+#include <libavutil/opt.h>
- #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
- }
- 
-@@ -589,17 +590,17 @@
-     m_avpicture->quality = m_videoQMin;
- 
- #ifdef USE_ORIG
--    m_avcontext->flags |= CODEC_FLAG_PART;   // data partitioning
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->flags |= CODEC_FLAG_4MV;    // 4 motion vectors
- #else
-     m_avcontext->max_b_frames=0; /*don't use b frames*/
-     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
--    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
-+    av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
-     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
-     m_avcontext->flags|=CODEC_FLAG_4MV;
-     m_avcontext->flags|=CODEC_FLAG_GMC;
-     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
--    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+    av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
- #endif
-     m_avcontext->opaque = this;              // for use in RTP callback
- }
-@@ -804,7 +805,7 @@
-         // Should the next frame be an I-Frame?
-         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
-         {
--            m_avpicture->pict_type = FF_I_TYPE;
-+            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
-         }
-         else // No IFrame requested, let avcodec decide what to do
-         {
-@@ -1325,7 +1326,7 @@
- 
- void MPEG4DecoderContext::SetStaticDecodingParams() {
-     m_avcontext->flags |= CODEC_FLAG_4MV; 
--    m_avcontext->flags |= CODEC_FLAG_PART;
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
- }
- 
diff --git a/testing/openconnect/PKGBUILD b/testing/openconnect/PKGBUILD
deleted file mode 100644
index 1daa426a7..000000000
--- a/testing/openconnect/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 165196 2012-08-12 20:09:11Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=openconnect
-pkgver=4.06
-pkgrel=1
-epoch=1
-pkgdesc="Open client for Cisco AnyConnect VPN"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'openssl' 'libproxy' 'vpnc')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e827c9d08bd4d6983e3cbd0c9c19b978')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr \
-      --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD
deleted file mode 100644
index 90bdbbe68..000000000
--- a/testing/opencv/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 169645 2012-10-25 01:35:31Z eric $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.4.2
-pkgrel=5
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.org/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3')
-makedepends=('cmake' 'python2-numpy' 'eigen2')
-optdepends=('opencv-docs'
-            'opencv-samples'
-            'eigen2'
-            'python2-numpy: Python 2.x interface')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2")
-md5sums=('059ef86fc1724d69b75832a0d2929ff5')
-
-_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON'
-            '-D BUILD_TESTS=OFF'
-            '-D ENABLE_SSE=ON'
-            '-D ENABLE_SSE2=ON'
-            '-D ENABLE_SSE3=OFF'
-            '-D ENABLE_SSSE3=OFF'
-            '-D ENABLE_SSE41=OFF'
-            '-D ENABLE_SSE42=OFF'
-            '-D BUILD_EXAMPLES=ON'
-            '-D INSTALL_C_EXAMPLES=ON'
-            '-D INSTALL_PYTHON_EXAMPLES=ON'
-            '-D WITH_XINE=ON'
-            '-D WITH_QT=OFF'
-            '-D WITH_QT_OPENGL=OFF'
-            '-D WITH_UNICAP=OFF'
-            '-D WITH_PVAPI=OFF'
-            '-D WITH_OPENNI=OFF'
-            '-D WITH_TBB=OFF'
-            '-D WITH_IPP=OFF'
-            '-D WITH_CUDA=OFF'
-            '-D USE_FAST_MATH=ON')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # x64, i.e "Athlon64" and upwards, can use SSE3
-  [ $CARCH = x86_64 ] && \
-    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
-
-  cmake ${_cmakeopts[@]} .
-
-  make
-}
-
-package_opencv() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd "$pkgdir/usr/share"
-
-  # separate docs package; also be -R friendly
-  [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc"
-
-  # separate samples package
-  [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples"
-}
-
-package_opencv-docs() {
-  pkgdesc+=" (documentation)"
-  unset depends
-  unset optdepends
-  options=('docs')
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_opencv-samples() {
-  pkgdesc+=" (samples)"
-  depends=('bash')
-  unset optdepends
-  unset options
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/$_realname"
-  cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/openexr/PKGBUILD b/testing/openexr/PKGBUILD
deleted file mode 100644
index 4c54c859b..000000000
--- a/testing/openexr/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169646 2012-10-25 01:35:34Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=openexr
-pkgver=1.7.1
-pkgrel=2
-pkgdesc="An high dynamic-range image file format library"
-url="http://www.openexr.com/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('zlib' 'ilmbase')
-options=('!libtool')
-source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'gcc43.patch')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/gcc43.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1'
-         'd91fae759053a70bcedcf02eb33ca4a2')
diff --git a/testing/openexr/gcc43.patch b/testing/openexr/gcc43.patch
deleted file mode 100644
index ab99eb9a1..000000000
--- a/testing/openexr/gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exrenvmap/blurImage.cpp
-+++ exrenvmap/blurImage.cpp
-@@ -39,6 +39,8 @@
- //
- //-----------------------------------------------------------------------------
- 
-+#include <cstring>
-+
- #include <blurImage.h>
- 
- #include <resizeImage.h>
diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD
deleted file mode 100644
index ba6380387..000000000
--- a/testing/openldap/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 168437 2012-10-11 21:32:47Z eric $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.33
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
-options=('!makeflags')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default slapd.service slapd.tmpfiles
-        ntlm.patch)
-sha1sums=('0cea642ba2dae1eb719da41bfedb9eba72ad504d'
-          'b684038a7f5bc7d2ba470b2d16ee47b5aae64c65'
-          'd89b8a533045123f1ab46c9c430cf132d58a20a4'
-          'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4'
-          'f86a82e35ebe15026980467c9dee4007e686b795'
-          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
-
-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 \
-    --without-fetch \
-    --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' '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}" 'libltdl' '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 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service
-  install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openldap/mutex-end-of-struct-sigsegv.patch b/testing/openldap/mutex-end-of-struct-sigsegv.patch
deleted file mode 100644
index e8996386a..000000000
--- a/testing/openldap/mutex-end-of-struct-sigsegv.patch
+++ /dev/null
@@ -1,293 +0,0 @@
- libraries/libldap/init.c     |    8 ++-
- libraries/libldap/ldap-int.h |  198 ++++++++++++++++++++++--------------------
- 2 files changed, 110 insertions(+), 96 deletions(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 39292d2..9d37e64 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -36,7 +36,13 @@
- #include "lutil.h"
- 
- struct ldapoptions ldap_int_global_options =
--	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };  
-+	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE
-+		LDAP_LDO_NULLARG
-+		LDAP_LDO_CONNECTIONLESS_NULLARG
-+		LDAP_LDO_TLS_NULLARG
-+		LDAP_LDO_SASL_NULLARG
-+		LDAP_LDO_GSSAPI_NULLARG
-+		LDAP_LDO_MUTEX_NULLARG };
- 
- #define ATTR_NONE	0
- #define ATTR_BOOL	1
-diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index f8e6126..ac6c9e5 100644
---- a/libraries/libldap/ldap-int.h
-+++ b/libraries/libldap/ldap-int.h
-@@ -185,29 +185,59 @@ struct ldapoptions {
- #define LDAP_TRASHED_SESSION	0xFF
- 	int   ldo_debug;
- 
--#ifdef LDAP_R_COMPILE
--	ldap_pvt_thread_mutex_t	ldo_mutex;
--#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
--#else
--#define LDAP_LDO_MUTEX_NULLARG
--#endif
-+	ber_int_t		ldo_version;
-+	ber_int_t		ldo_deref;
-+	ber_int_t		ldo_timelimit;
-+	ber_int_t		ldo_sizelimit;
-+
-+	/* per API call timeout */
-+	struct timeval		ldo_tm_api;
-+	struct timeval		ldo_tm_net;
-+
-+	LDAPURLDesc *ldo_defludp;
-+	int		ldo_defport;
-+	char*	ldo_defbase;
-+	char*	ldo_defbinddn;	/* bind dn */
-+
-+	/*
-+	 * Per connection tcp-keepalive settings (Linux only,
-+	 * ignored where unsupported)
-+	 */
-+	ber_int_t ldo_keepalive_idle;
-+	ber_int_t ldo_keepalive_probes;
-+	ber_int_t ldo_keepalive_interval;
-+
-+	int		ldo_refhoplimit;	/* limit on referral nesting */
-+
-+	/* LDAPv3 server and client controls */
-+	LDAPControl	**ldo_sctrls;
-+	LDAPControl **ldo_cctrls;
-+
-+	/* LDAP rebind callback function */
-+	LDAP_REBIND_PROC *ldo_rebind_proc;
-+	void *ldo_rebind_params;
-+	LDAP_NEXTREF_PROC *ldo_nextref_proc;
-+	void *ldo_nextref_params;
-+	LDAP_URLLIST_PROC *ldo_urllist_proc;
-+	void *ldo_urllist_params;
-+
-+	/* LDAP connection callback stack */
-+	ldaplist *ldo_conn_cbs;
-+
-+	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
-+
-+#define LDAP_LDO_NULLARG	,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0
- 
- #ifdef LDAP_CONNECTIONLESS
- #define	LDAP_IS_UDP(ld)		((ld)->ld_options.ldo_is_udp)
- 	void*			ldo_peer;	/* struct sockaddr* */
- 	char*			ldo_cldapdn;
- 	int			ldo_is_udp;
-+#define	LDAP_LDO_CONNECTIONLESS_NULLARG	,0,0,0
-+#else
-+#define	LDAP_LDO_CONNECTIONLESS_NULLARG
- #endif
- 
--	/* per API call timeout */
--	struct timeval		ldo_tm_api;
--	struct timeval		ldo_tm_net;
--
--	ber_int_t		ldo_version;
--	ber_int_t		ldo_deref;
--	ber_int_t		ldo_timelimit;
--	ber_int_t		ldo_sizelimit;
--
- #ifdef HAVE_TLS
-    	/* tls context */
-    	void		*ldo_tls_ctx;
-@@ -226,16 +256,12 @@ struct ldapoptions {
-    	int			ldo_tls_mode;
-    	int			ldo_tls_require_cert;
- 	int			ldo_tls_impl;
--#ifdef HAVE_OPENSSL_CRL
-    	int			ldo_tls_crlcheck;
--#endif
-+#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0
-+#else
-+#define LDAP_LDO_TLS_NULLARG
- #endif
- 
--	LDAPURLDesc *ldo_defludp;
--	int		ldo_defport;
--	char*	ldo_defbase;
--	char*	ldo_defbinddn;	/* bind dn */
--
- #ifdef HAVE_CYRUS_SASL
- 	char*	ldo_def_sasl_mech;		/* SASL Mechanism(s) */
- 	char*	ldo_def_sasl_realm;		/* SASL realm */
-@@ -244,6 +270,9 @@ struct ldapoptions {
- 
- 	/* SASL Security Properties */
- 	struct sasl_security_properties	ldo_sasl_secprops;
-+#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0}
-+#else
-+#define LDAP_LDO_SASL_NULLARG
- #endif
- 
- #ifdef HAVE_GSSAPI
-@@ -253,34 +282,17 @@ struct ldapoptions {
- #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT	0x0001
- #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL	0x0002
- 	unsigned ldo_gssapi_options;
-+#define LDAP_LDO_GSSAPI_NULLARG ,0,0
-+#else
-+#define LDAP_LDO_GSSAPI_NULLARG
- #endif
- 
--	/*
--	 * Per connection tcp-keepalive settings (Linux only,
--	 * ignored where unsupported)
--	 */
--	ber_int_t ldo_keepalive_idle;
--	ber_int_t ldo_keepalive_probes;
--	ber_int_t ldo_keepalive_interval;
--
--	int		ldo_refhoplimit;	/* limit on referral nesting */
--
--	/* LDAPv3 server and client controls */
--	LDAPControl	**ldo_sctrls;
--	LDAPControl **ldo_cctrls;
--
--	/* LDAP rebind callback function */
--	LDAP_REBIND_PROC *ldo_rebind_proc;
--	void *ldo_rebind_params;
--	LDAP_NEXTREF_PROC *ldo_nextref_proc;
--	void *ldo_nextref_params;
--	LDAP_URLLIST_PROC *ldo_urllist_proc;
--	void *ldo_urllist_params;
--
--	/* LDAP connection callback stack */
--	ldaplist *ldo_conn_cbs;
--
--	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
-+#ifdef LDAP_R_COMPILE
-+	ldap_pvt_thread_mutex_t	ldo_mutex;
-+#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
-+#else
-+#define LDAP_LDO_MUTEX_NULLARG
-+#endif
- };
- 
- 
-@@ -375,6 +387,46 @@ struct ldap_common {
- 	Sockbuf		*ldc_sb;	/* socket descriptor & buffer */
- #define ld_sb			ldc->ldc_sb
- 
-+	unsigned short	ldc_lberoptions;
-+#define	ld_lberoptions		ldc->ldc_lberoptions
-+
-+	/* protected by msgid_mutex */
-+	ber_len_t		ldc_msgid;
-+#define	ld_msgid		ldc->ldc_msgid
-+
-+	/* do not mess with these */
-+	/* protected by req_mutex */
-+	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
-+	/* protected by res_mutex */
-+	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
-+#define	ld_requests		ldc->ldc_requests
-+#define	ld_responses		ldc->ldc_responses
-+
-+	/* protected by abandon_mutex */
-+	ber_len_t	ldc_nabandoned;
-+	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
-+#define	ld_nabandoned		ldc->ldc_nabandoned
-+#define	ld_abandoned		ldc->ldc_abandoned
-+
-+	/* unused by libldap */
-+	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
-+#define	ld_cache		ldc->ldc_cache
-+
-+	/* do not mess with the rest though */
-+
-+	/* protected by conn_mutex */
-+	LDAPConn	*ldc_defconn;	/* default connection */
-+#define	ld_defconn		ldc->ldc_defconn
-+	LDAPConn	*ldc_conns;	/* list of server connections */
-+#define	ld_conns		ldc->ldc_conns
-+	void		*ldc_selectinfo;/* platform specifics for select */
-+#define	ld_selectinfo		ldc->ldc_selectinfo
-+
-+	/* ldap_common refcnt - free only if 0 */
-+	/* protected by ldc_mutex */
-+	unsigned int		ldc_refcnt;
-+#define	ld_ldcrefcnt		ldc->ldc_refcnt
-+
- 	/* protected by ldo_mutex */
- 	struct ldapoptions ldc_options;
- #define ld_options		ldc->ldc_options
-@@ -403,66 +455,22 @@ struct ldap_common {
- #define ld_urllist_params	ld_options.ldo_urllist_params
- 
- #define ld_version		ld_options.ldo_version
--#ifdef LDAP_R_COMPILE
--#define	ld_ldopts_mutex		ld_options.ldo_mutex
--#endif
--
--	unsigned short	ldc_lberoptions;
--#define	ld_lberoptions		ldc->ldc_lberoptions
--
--	/* protected by msgid_mutex */
--	ber_len_t		ldc_msgid;
--#define	ld_msgid		ldc->ldc_msgid
--
--	/* do not mess with these */
--	/* protected by req_mutex */
--	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
--	/* protected by res_mutex */
--	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
--#define	ld_requests		ldc->ldc_requests
--#define	ld_responses		ldc->ldc_responses
- 
- #ifdef LDAP_R_COMPILE
-+	ldap_pvt_thread_mutex_t	ldc_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_msgid_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_conn_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_req_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_res_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_abandon_mutex;
-+#define	ld_ldopts_mutex		ld_options.ldo_mutex
-+#define	ld_ldcmutex		ldc->ldc_mutex
- #define	ld_msgid_mutex		ldc->ldc_msgid_mutex
- #define	ld_conn_mutex		ldc->ldc_conn_mutex
- #define	ld_req_mutex		ldc->ldc_req_mutex
- #define	ld_res_mutex		ldc->ldc_res_mutex
- #define	ld_abandon_mutex	ldc->ldc_abandon_mutex
- #endif
--
--	/* protected by abandon_mutex */
--	ber_len_t	ldc_nabandoned;
--	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
--#define	ld_nabandoned		ldc->ldc_nabandoned
--#define	ld_abandoned		ldc->ldc_abandoned
--
--	/* unused by libldap */
--	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
--#define	ld_cache		ldc->ldc_cache
--
--	/* do not mess with the rest though */
--
--	/* protected by conn_mutex */
--	LDAPConn	*ldc_defconn;	/* default connection */
--#define	ld_defconn		ldc->ldc_defconn
--	LDAPConn	*ldc_conns;	/* list of server connections */
--#define	ld_conns		ldc->ldc_conns
--	void		*ldc_selectinfo;/* platform specifics for select */
--#define	ld_selectinfo		ldc->ldc_selectinfo
--
--	/* ldap_common refcnt - free only if 0 */
--#ifdef LDAP_R_COMPILE
--	ldap_pvt_thread_mutex_t	ldc_mutex;
--#define	ld_ldcmutex		ldc->ldc_mutex
--#endif
--	/* protected by ldc_mutex */
--	unsigned int		ldc_refcnt;
--#define	ld_ldcrefcnt		ldc->ldc_refcnt
- };
- 
- struct ldap {
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 604f6b275..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
-        add_daemon slapd
-        stat_done
-      fi
-    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/openldap/slapd.service b/testing/openldap/slapd.service
deleted file mode 100644
index d8baa57b5..000000000
--- a/testing/openldap/slapd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=OpenLDAP server daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/slapd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/openldap/slapd.tmpfiles b/testing/openldap/slapd.tmpfiles
deleted file mode 100644
index 5f63bd636..000000000
--- a/testing/openldap/slapd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-D /run/openldap 0750 ldap ldap -
diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD
deleted file mode 100644
index 415e010a7..000000000
--- a/testing/openmpi/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 167134 2012-09-26 01:37:00Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-pkgname=openmpi
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="High performance message passing library (MPI)"
-arch=('i686' 'x86_64')
-url="http://www.open-mpi.org"
-license=('custom')
-depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
-makedepends=('inetutils')
-options=(!libtool)
-source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('694fd3bac911cdb22f77175884d819b6fea871df')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # Make sure we use the system ltdl librariry rather than the ones in the tarball
-   rm -r opal/libltdl
-
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/${pkgname} \
-               --mandir=/usr/share/man \
-               --enable-mpi-f90 \
-               --libdir=/usr/lib/${pkgname} \
-               --with-threads=posix \
-               --enable-smp-locks \
-               --with-valgrind \
-               --enable-memchecker \
-               --enable-debug \
-               --enable-pretty-print-stacktrace \
-               --without-slurm \
-               --with-hwloc=/usr \
-               --with-libltdl=/usr  \
-               FC=/usr/bin/gfortran \
-               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-
-   # FS#28583
-   install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig
-   for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do
-      ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/
-   done
-
-   # Openmpi's otfinfo conflicts with the one from texlive
-   mv "${pkgdir}"/usr/bin/otfinfo{,mpi}
-
-   # Openmpi's otfdump conflicts with the one from libotf
-   mv "${pkgdir}"/usr/bin/otfdump{,ompi}
-
-   # Remove dangling symlink
-   rm "${pkgdir}"/usr/share/man/man1/orteCC.1
-
-   install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d
-   echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
-
-   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
deleted file mode 100644
index a02c6e97e..000000000
--- a/testing/openssh/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 169589 2012-10-23 22:58:43Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=openssh
-pkgver=6.1p1
-pkgrel=3
-pkgdesc='Free version of the SSH connectivity tools'
-url='http://www.openssh.org/portable.html'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-makedepends=('linux-headers')
-depends=('krb5' 'openssl' 'libedit' 'ldns')
-optdepends=('xorg-xauth: X11 forwarding'
-            'x11-ssh-askpass: input passphrase in X')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.close-sessions'
-        'sshdgenkeys.service'
-        'sshd@.service'
-        'sshd.service'
-        'sshd.socket'
-        'sshd.confd'
-        'sshd.pam'
-        'sshd')
-sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
-          '954bf1660aa32620c37034320877f4511b767ccb'
-          '6df5be396f8c593bb511a249a1453294d18a01a6'
-          'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
-          'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
-          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          '659e3ee95c269014783ff8b318c6f50bf7496fbd'
-          '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
-
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/ssh \
-		--sysconfdir=/etc/ssh \
-		--with-ldns \
-		--with-libedit \
-		--with-ssl-engine \
-		--with-pam \
-		--with-privsep-user=nobody \
-		--with-kerberos5=/usr \
-		--with-xauth=/usr/bin/xauth \
-		--with-mantype=man \
-		--with-md5-passwords \
-		--with-pid-dir=/run \
-
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make tests ||
-	grep $USER /etc/passwd | grep -q /bin/false
-	# connect.sh fails when run with stupid login shell
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
-	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-
-	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
-	install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
-	install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
-	install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
-
-	install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
-	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
-	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
-
-	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
-	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
-	install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
-
-	sed \
-		-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
-		-e '/^#UsePAM no$/c UsePAM yes' \
-		-i "${pkgdir}"/etc/ssh/sshd_config
-}
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
deleted file mode 100755
index d60804e84..000000000
--- a/testing/openssh/sshd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-	PID=
-	rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
-	start)
-		stat_busy 'Starting Secure Shell Daemon'
-		/usr/bin/ssh-keygen -A
-		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			add_daemon sshd
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Secure Shell Daemon'
-		[[ ! -z $PID ]] && kill $PID &> /dev/null
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			rm_daemon sshd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709fc..000000000
--- a/testing/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/testing/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
deleted file mode 100644
index aeef8be27..000000000
--- a/testing/openssh/sshd.pam
+++ /dev/null
@@ -1,13 +0,0 @@
-#%PAM-1.0
-#auth		required	pam_securetty.so	#Disable remote root
-auth		required	pam_unix.so
-auth		required	pam_env.so
-account		required	pam_nologin.so
-account		required	pam_unix.so
-account		required	pam_time.so
-password	required	pam_unix.so
-session		required	pam_unix_session.so
-session		required	pam_limits.so
-session         optional        pam_loginuid.so
--session	optional	pam_ck_connector.so nox11
--session	optional	pam_systemd.so
diff --git a/testing/openssh/sshd.service b/testing/openssh/sshd.service
deleted file mode 100644
index 633164e5d..000000000
--- a/testing/openssh/sshd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OpenSSH Daemon
-Wants=sshdgenkeys.service
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=/usr/sbin/sshd -D
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-
-# This service file runs an SSH daemon that forks for each incoming connection.
-# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service.
diff --git a/testing/openssh/sshd.socket b/testing/openssh/sshd.socket
deleted file mode 100644
index e09e32869..000000000
--- a/testing/openssh/sshd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Conflicts=sshd.service
-Wants=sshdgenkeys.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/testing/openssh/sshd@.service b/testing/openssh/sshd@.service
deleted file mode 100644
index 2fd9b0814..000000000
--- a/testing/openssh/sshd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=OpenSSH Per-Connection Daemon
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=-/usr/sbin/sshd -i
-StandardInput=socket
-StandardError=syslog
diff --git a/testing/openssh/sshdgenkeys.service b/testing/openssh/sshdgenkeys.service
deleted file mode 100644
index 8c27d7110..000000000
--- a/testing/openssh/sshdgenkeys.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=SSH Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_key
-ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
-
-[Service]
-ExecStart=/usr/bin/ssh-keygen -A
-Type=oneshot
-RemainAfterExit=yes
diff --git a/testing/openssh/tmpfiles.d b/testing/openssh/tmpfiles.d
deleted file mode 100644
index 7c5b26100..000000000
--- a/testing/openssh/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /var/empty 0755 root root -
diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD
deleted file mode 100644
index ea7443098..000000000
--- a/testing/openvpn/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 165397 2012-08-17 23:28:47Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=openvpn
-pkgver=2.2.2
-pkgrel=2
-pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
-arch=(i686 x86_64)
-url="http://openvpn.net/index.php/open-source.html"
-depends=('openssl' 'lzo2' 'iproute2')
-license=('custom')
-backup=(usr/share/openvpn/easy-rsa/vars
-        usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf
-        etc/conf.d/openvpn-tapdev)
-source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
-        http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc
-        openvpn@.service
-        openvpn.rc
-        openvpn-tapdev.rc
-        openvpn-tapdev.conf)
-md5sums=('c5181e27b7945fa6276d21873329c5c7'
-         '81ff11ec8cd9fc3c8bc646aae24c4298'
-         '44047df812a3fcd57a7e36a61732a9b9'
-         'a3809b9727f0c2af2d0770f5c7442db2'
-         'd2c48e970088d679dd3c2afd914ff731'
-         '722f483c9e3ce2ec66d3301aaf7cf3d5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Build openvpn
-  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
-    --prefix=/usr \
-    --enable-password-save \
-    --mandir=/usr/share/man \
-    --enable-iproute2
-  make
-
-  # Build plugins
-  for plug in auth-pam down-root; do
-    cd $srcdir/$pkgname-$pkgver/plugin/$plug
-    make
-  done
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  # Install openvpn
-  make DESTDIR=$pkgdir install
-  install -d -m755 $pkgdir/etc/openvpn
-  # Install examples
-  install -d -m755 $pkgdir/usr/share/openvpn
-  cp -r sample-config-files $pkgdir/usr/share/openvpn/examples
-  find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \;
-  find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \;
-  # Install license
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-  # Install plugins
-  for plug in auth-pam down-root; do
-    cd $srcdir/$pkgname-$pkgver/plugin/$plug
-    install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so
-    cd -
-  done
-  # Install contrib
-  install -d -m755 $pkgdir/usr/share/openvpn/contrib
-  cp -r contrib $pkgdir/usr/share/openvpn
-  # Install easy-rsa
-  cd $srcdir/$pkgname-$pkgver
-  make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa
-  rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf
-  # Install rc scripts
-  install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn
-  install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev
-  install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev
-  install -D -m644 $srcdir/openvpn@.service $pkgdir/usr/lib/systemd/system/openvpn@.service
-}
diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf
deleted file mode 100644
index afa5586dd..000000000
--- a/testing/openvpn/openvpn-tapdev.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# /etc/conf.d/openvpn-tapdev
-#
-# Place openvpn-tapdev before network into your DAEMONS array
-# This will create permanent tap devices which you can use for bridging
-#
-# Example:
-# TAPDEVS="work home"
-# Will create two tap devices "work" and "home"
-#
-
-TAPDEVS=""
diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc
deleted file mode 100755
index 2c51f8248..000000000
--- a/testing/openvpn/openvpn-tapdev.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/openvpn-tapdev
-
-case "$1" in
-  start)
-    stat_busy "Creating tap devices for OpenVPN ... "
-    success=0
-    for tapdev in ${TAPDEVS}; do
-      stat_append "${tapdev} "
-      /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
-    done
-    if [ $success -eq 0 ]; then
-      add_daemon openvpn-tapdev
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Destroying tap devices for OpenVPN ..."
-    for tapdev in ${TAPDEVS}; do
-      stat_append "${tapdev} "
-      /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
-    done
-    rm_daemon openvpn-tapdev
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc
deleted file mode 100755
index 96c28b641..000000000
--- a/testing/openvpn/openvpn.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-CFGDIR="/etc/openvpn"
-STATEDIR="/var/run/openvpn"
-
-case "$1" in
-  start)
-    stat_busy "Starting OpenVPN ... "
-    success=0
-    mkdir -p "${STATEDIR}"
-    for cfg in "${CFGDIR}"/*.conf; do
-      stat_append "$(basename "${cfg}" .conf) "
-      /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$?
-    done
-    if [ $success -eq 0 ]; then
-      add_daemon openvpn
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenVPN ..."
-    for pidfile in "${STATEDIR}"/*.pid; do
-      stat_append "$(basename "${pidfile}" .pid) "
-      kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null
-      rm -f "${pidfile}"
-    done
-    rm_daemon openvpn
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openvpn/openvpn@.service b/testing/openvpn/openvpn@.service
deleted file mode 100644
index c3de3bdf7..000000000
--- a/testing/openvpn/openvpn@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=OpenVPN connection to %i
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i --cd /etc/openvpn
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/p11-kit/PKGBUILD b/testing/p11-kit/PKGBUILD
deleted file mode 100644
index babf57fa7..000000000
--- a/testing/p11-kit/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 165200 2012-08-12 20:42:41Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=p11-kit
-pkgver=0.13
-pkgrel=1
-pkgdesc="Library to work with PKCS#11 modules"
-arch=(i686 x86_64)
-url="http://p11-glue.freedesktop.org"
-license=('BSD')
-depends=(glibc)
-options=(!libtool)
-source=($url/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('3892bc07ff54b1b391aad4628911801d')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-module-path=/usr/lib/pkcs11
-  make
-}
-
-package() {
-  cd  $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/pam/PKGBUILD b/testing/pam/PKGBUILD
deleted file mode 100644
index 8c82ad970..000000000
--- a/testing/pam/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 168471 2012-10-12 09:19:17Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=pam
-pkgver=1.1.6
-pkgrel=1
-pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.kernel.org/pub/linux/libs/pam/"
-depends=('glibc' 'db' 'cracklib' 'libtirpc' 'pambase')
-makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
-backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment)
-source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
-        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
-        ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
-        pam_unix2-glibc216.patch
-        pam_namespace-build-1.1.6.patch)
-options=('!libtool' '!emptydirs')
-md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
-         'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
-         'dac109f68e04a4df37575fda6001ea17'
-         '440a510164ba5eb69bf41e129746ff44')
-
-build() {
-  cd $srcdir/Linux-PAM-$pkgver
-  ./configure --libdir=/usr/lib
-  patch -Np0 -i ../pam_namespace-build-1.1.6.patch
-  make
-
-  cd $srcdir/pam_unix2-2.9.1
-  patch -Np1 -i ../pam_unix2-glibc216.patch
-  ./configure --libdir=/usr/lib
-  make
-}
-
-package() {
-  cd $srcdir/Linux-PAM-$pkgver
-  make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
-
-  # build pam_unix2 module
-  # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
-  cd $srcdir/pam_unix2-2.9.1
-  make DESTDIR=$pkgdir install
-
-  # add the realtime permissions for audio users
-  sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
-  cat >>$pkgdir/etc/security/limits.conf <<_EOT
-*               -       rtprio          0
-*               -       nice            0
-@audio          -       rtprio          65
-@audio          -       nice           -10
-@audio          -       memlock         40000
-_EOT
-
-  # fix some missing symlinks from old pam for compatibility
-  cd $pkgdir/usr/lib/security
-  ln -s pam_unix.so pam_unix_acct.so
-  ln -s pam_unix.so pam_unix_auth.so
-  ln -s pam_unix.so pam_unix_passwd.so
-  ln -s pam_unix.so pam_unix_session.so
-
-  # set unix_chkpwd uid
-  chmod +s $pkgdir/sbin/unix_chkpwd
-}
diff --git a/testing/pam/other b/testing/pam/other
deleted file mode 100644
index 08498b423..000000000
--- a/testing/pam/other
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
diff --git a/testing/pam/pam.install b/testing/pam/pam.install
deleted file mode 100644
index 9d4588084..000000000
--- a/testing/pam/pam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  # need to run this immediately -- pacman only runs it at the end of
-  # all package installs
-  /sbin/ldconfig -r .
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/testing/pam/pam_namespace-build-1.1.6.patch b/testing/pam/pam_namespace-build-1.1.6.patch
deleted file mode 100644
index aeabc234c..000000000
--- a/testing/pam/pam_namespace-build-1.1.6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/pam_namespace/Makefile~	2012-10-12 10:59:13.557550706 +0200
-+++ modules/pam_namespace/Makefile	2012-10-12 10:59:13.564217270 +0200
-@@ -869,7 +869,7 @@
- 
- 
- install-data-local:
--	mkdir -p $(namespaceddir)
-+	mkdir -p $(DESTDIR)$(namespaceddir)
- README: pam_namespace.8.xml namespace.conf.5.xml
- -include $(top_srcdir)/Make.xml.rules
- 
diff --git a/testing/pam/pam_unix2-glibc216.patch b/testing/pam/pam_unix2-glibc216.patch
deleted file mode 100644
index faa6a235f..000000000
--- a/testing/pam/pam_unix2-glibc216.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pam_unix2-2.9.1/src/read-files.c
-===================================================================
---- pam_unix2-2.9.1.orig/src/read-files.c
-+++ pam_unix2-2.9.1/src/read-files.c
-@@ -30,8 +30,14 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <nss.h>
--#include <bits/libc-lock.h>
-+#include <pthread.h>
- #define __libc_lock_t pthread_mutex_t
-+#define __libc_lock_define_initialized(CLASS,NAME) \
-+  CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
-+#define __libc_lock_lock(NAME) \
-+  pthread_mutex_lock, (&(NAME))
-+#define __libc_lock_unlock(NAME) \
-+  pthread_mutex_unlock, (&(NAME))
- 
- #include "read-files.h"
- 
diff --git a/testing/pango/PKGBUILD b/testing/pango/PKGBUILD
deleted file mode 100644
index 1e6d3616c..000000000
--- a/testing/pango/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169163 2012-10-18 19:23:05Z jgc $ 
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pango
-pkgver=1.32.1
-pkgrel=1
-pkgdesc="A library for layout and rendering of text"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libthai' 'cairo' 'libxft' 'harfbuzz')
-makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection')
-options=('!libtool')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('484babf7e1ac4bf959a0babe8168f180acb516932d70e2985de5f6e2961fcd82')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-included-modules=basic-fc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/pango"
-}
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/pangox-compat/PKGBUILD b/testing/pangox-compat/PKGBUILD
deleted file mode 100644
index 13375e949..000000000
--- a/testing/pangox-compat/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169162 2012-10-18 19:23:02Z jgc $ 
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=pangox-compat
-pkgver=0.0.2
-pkgrel=1
-pkgdesc="X Window System font support for Pango"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('pango')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
-}
diff --git a/testing/patch/PKGBUILD b/testing/patch/PKGBUILD
deleted file mode 100644
index fa4b51469..000000000
--- a/testing/patch/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167233 2012-09-28 23:02:27Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=patch
-pkgver=2.7.1
-pkgrel=1
-pkgdesc="A utility to apply patch files to original sources"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/patch/patch.html"
-license=('GPL')
-groups=('base-devel')
-depends=('glibc')
-makedepends=('ed')
-optdepends=('ed: for patch -e functionality')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('e9ae5393426d3ad783a300a338c09b72'
-         'b12189e0de3cb2af25268441647ec517')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/patch/patch-2.6.1-get-arg.patch b/testing/patch/patch-2.6.1-get-arg.patch
deleted file mode 100644
index 45f3bc8a5..000000000
--- a/testing/patch/patch-2.6.1-get-arg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c
---- patch-2.6.1/src/patch.c.get-arg	2010-07-27 18:05:26.217150510 +0100
-+++ patch-2.6.1/src/patch.c	2010-07-27 18:05:47.464150892 +0100
-@@ -558,7 +558,7 @@ static struct option const longopts[] =
-   {"remove-empty-files", no_argument, NULL, 'E'},
-   {"force", no_argument, NULL, 'f'},
-   {"fuzz", required_argument, NULL, 'F'},
--  {"get", no_argument, NULL, 'g'},
-+  {"get", required_argument, NULL, 'g'},
-   {"input", required_argument, NULL, 'i'},
-   {"ignore-whitespace", no_argument, NULL, 'l'},
- #ifdef ENABLE_MERGE
diff --git a/testing/pciutils/PKGBUILD b/testing/pciutils/PKGBUILD
deleted file mode 100644
index 2f747eb34..000000000
--- a/testing/pciutils/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 162650 2012-06-27 15:03:29Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pciutils
-pkgver=3.1.10
-pkgrel=1
-pkgdesc="PCI bus configuration space access library and tools"
-arch=(i686 x86_64)
-license=('GPL2')
-groups=('base')
-url="http://mj.ucw.cz/sw/pciutils/"
-depends=('glibc' 'hwids')
-source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-  cp lib/libpci.a "${srcdir}/"
-  make clean
-  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
-  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
-  # this is now supplied by the hwids package
-  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
-}
diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD
deleted file mode 100644
index 8672846ce..000000000
--- a/testing/pcre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 163200 2012-07-09 01:30:40Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=pcre
-pkgver=8.31
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions"
-arch=('i686' 'x86_64')
-url="http://www.pcre.org/"
-license=('BSD')
-depends=('gcc-libs')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('1c9a276af932b5599157f96e945391f0'
-         '873bcd2cd9f1e0aa1e28e256b3e31506')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-  ./configure --prefix=/usr --enable-pcre16 --enable-jit \
-    --enable-utf8 --enable-unicode-properties
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/perl-sdl/PKGBUILD b/testing/perl-sdl/PKGBUILD
deleted file mode 100644
index 682be8a60..000000000
--- a/testing/perl-sdl/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 165797 2012-08-30 16:55:08Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=perl-sdl
-pkgver=2.540
-pkgrel=2
-pkgdesc="Simple DirectMedia Layer for Perl"
-arch=(i686 x86_64)
-license=(LGPL)
-url="http://sdl.perl.org"
-depends=(perl-alien-sdl perl-tie-simple
-         sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg)
-makedepends=('perl-module-build>=0.40')
-options=('!emptydirs')
-replaces=(sdl_perl)
-conflicts=(sdl_perl)
-provides=("sdl_perl=$pkgver")
-# http://search.cpan.org/dist/SDL/
-_author=JTPALMER
-source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz)
-md5sums=('1a5d7849cbdfde4982b28458e38ab172')
-
-build() {
-  cd SDL-$pkgver
-  # Perl selects the proper CFLAGS set for binary modules
-  unset CFLAGS
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor
-  perl Build
-}
-
-check() {
-  cd SDL-$pkgver
-  perl Build test || true
-}
-
-package() {
-  cd SDL-$pkgver
-  perl Build install destdir="$pkgdir"
-}
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 f5f8fa311..000000000
--- a/testing/perl/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 165042 2012-08-09 14:58:00Z bluewind $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: kevin <kevin.archlinux.org>
-# Contributor: judd <jvinet.zeroflux.org>
-# Contributor: francois <francois.archlinux.org> 
-pkgname=perl
-pkgver=5.16.1
-pkgrel=1
-pkgdesc="A highly capable, feature-rich programming language"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://www.perl.org"
-groups=('base')
-depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
-changelog=ChangeLog
-source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 
-perlbin.sh
-perlbin.csh
-provides.pl)
-install=perl.install
-options=('makeflags' '!purge')
-md5sums=('b87358e2c461a898cfd7c334e7dd8993'
-         '5ed2542fdb9a60682f215bd33701e61a'
-         '1f0cbbee783e8a6d32f01be5118e0d5e'
-         '999c3eea6464860704abbb055a0f0896')
-
-# workaround to let the integrity check find the correct provides array
-if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then
-	true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p'))
-fi
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    # for x86_64
-    arch_opts="-Dcccdlflags='-fPIC'"
-  else 
-    # for i686
-    arch_opts=""
-  fi
-
-  ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \
-    -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
-    -Dprivlib=/usr/share/perl5/core_perl \
-    -Darchlib=/usr/lib/perl5/core_perl \
-    -Dsitelib=/usr/share/perl5/site_perl \
-    -Dsitearch=/usr/lib/perl5/site_perl \
-    -Dvendorlib=/usr/share/perl5/vendor_perl \
-    -Dvendorarch=/usr/lib/perl5/vendor_perl \
-    -Dscriptdir=/usr/bin/core_perl \
-    -Dsitescript=/usr/bin/site_perl \
-    -Dvendorscript=/usr/bin/vendor_perl \
-    -Dinc_version_list=none \
-    -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \
-    -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}"
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
-#  make test
-}
-
-package() {
-  # hack to work around makepkg running the subshell in check_sanity()
-  new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .))
-  provides=(${new_provides[@]})
-
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install
-
-  ### Perl Settings ###
-  # Change man page extensions for site and vendor module builds.
-  # Use archlinux email address instead of my own.
-  sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \
-      -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \
-      -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \
-      -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl
-
-  ### CPAN Settings ###
-  # Set CPAN default config to use the site directories.
-  sed -e '/(makepl_arg =>/   s/""/"INSTALLDIRS=site"/' \
-      -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm
-
-  ### CPANPLUS Settings ###
-  # Set CPANPLUS default config to use the site directories.
-  sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \
-      -e "/{'buildflags'}/     s/'';/'installdirs=site';/" \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm
-
-  # Profile script to set paths to perl scripts.
-  install -D -m755 ${srcdir}/perlbin.sh \
-                   ${pkgdir}/etc/profile.d/perlbin.sh
-  # Profile script to set paths to perl scripts on csh. (FS#22441) 
-  install -D -m755 ${srcdir}/perlbin.csh \
-                  ${pkgdir}/etc/profile.d/perlbin.csh
-
-  (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
-  (cd ${pkgdir}/usr/bin/core_perl;  ln -sf c2ph pstruct; ln -sf s2p psed)
-  grep -Rl "${pkgdir}" ${pkgdir}/usr | \
-      xargs sed -i "s^${pkgdir}^^g"
-
-  # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/
-  # (FS#16488)
-  rm -f $pkgdir/usr/share/perl5/core_perl/*.pod
-  for d in $pkgdir/usr/share/perl5/core_perl/*; do
-    if [ -d $d -a $(basename $d) != "pod" ]; then
-      find $d -name *.pod -delete
-    fi
-  done
-  find $pkgdir/usr/lib -name *.pod -delete
-  find $pkgdir -name .packlist -delete
-}
diff --git a/testing/perl/digest_eval_hole.diff b/testing/perl/digest_eval_hole.diff
deleted file mode 100644
index 47904137b..000000000
--- a/testing/perl/digest_eval_hole.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001
-From: "Michael G. Schwern" <schwern@pobox.com>
-Date: Mon, 3 Oct 2011 19:05:29 +0100
-Subject: Close the eval "require $module" security hole in
- Digest->new($algorithm)
-
-Also the filter was incomplete.
-
-Bug-Debian: http://bugs.debian.org/644108
-
-Patch-Name: fixes/digest_eval_hole.diff
----
- cpan/Digest/Digest.pm    |    6 ++++--
- cpan/Digest/t/security.t |   14 ++++++++++++++
- 2 files changed, 18 insertions(+), 2 deletions(-)
- create mode 100644 cpan/Digest/t/security.t
-
-diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm
-index 384dfc8..d714434 100644
---- a/cpan/Digest/Digest.pm
-+++ b/cpan/Digest/Digest.pm
-@@ -24,7 +24,7 @@ sub new
-     shift;  # class ignored
-     my $algorithm = shift;
-     my $impl = $MMAP{$algorithm} || do {
--	$algorithm =~ s/\W+//;
-+	$algorithm =~ s/\W+//g;
- 	"Digest::$algorithm";
-     };
-     $impl = [$impl] unless ref($impl);
-@@ -35,7 +35,9 @@ sub new
- 	($class, @args) = @$class if ref($class);
- 	no strict 'refs';
- 	unless (exists ${"$class\::"}{"VERSION"}) {
--	    eval "require $class";
-+	    my $pm_file = $class . ".pm";
-+	    $pm_file =~ s{::}{/}g;
-+	    eval { require $pm_file };
- 	    if ($@) {
- 		$err ||= $@;
- 		next;
-diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t
-new file mode 100644
-index 0000000..5cba122
---- /dev/null
-+++ b/cpan/Digest/t/security.t
-@@ -0,0 +1,14 @@
-+#!/usr/bin/env perl
-+
-+# Digest->new() had an exploitable eval
-+
-+use strict;
-+use warnings;
-+
-+use Test::More tests => 1;
-+
-+use Digest;
-+
-+$LOL::PWNED = 0;
-+eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) };
-+is $LOL::PWNED, 0;
diff --git a/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 d2cdc762e..000000000
--- a/testing/perl/provides.pl
+++ /dev/null
@@ -1,299 +0,0 @@
-# provides.pl
-##
-# Script for printing out a provides list of every CPAN distribution
-# that is bundled with perl. You can run it before building perl
-# or you can run it after building perl. Required modules are in core
-# for perl 5.13 and above.  It might be nice if this didn't require
-# HTTP::Tiny and maybe just used wget or curl.
-#
-# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at
-# cpanmetadb.plackperl.org to cross-reference module files to their
-# providing CPAN distribution. Thank you Miyagawa!
-#
-# - Justin "juster" Davis <jrcd83@gmail.com>
-
-use warnings 'FATAL' => 'all';
-use strict;
-
-package Common;
-
-sub evalver
-{
-    my ($path, $mod) = @_;
-
-    open my $fh, '<', $path or die "open $path: $!";
-
-    my $m = ($mod
-        ? qr/(?:\$${mod}::VERSION|\$VERSION)/
-        : qr/\$VERSION/);
-
-    while (my $ln = <$fh>) {
-        next unless $ln =~ /\s*$m\s*=\s*.+/;
-        chomp $ln;
-        my $ver = do { no strict; eval $ln };
-        return $ver unless $@;
-        die qq{$path:$. bad version string in "$ln"\n};
-    }
-
-    close $fh;
-    return undef;
-}
-
-
-#-----------------------------------------------------------------------------
-
-package Dists;
-
-sub maindistfile
-{
-    my ($dist, $dir) = @_;
-
-    # libpath is the modern style, installing modules under lib/
-    # with dirs matching the name components.
-    my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm";
-
-    # dumbpath is an old style where there's no subdirs and just
-    # a .pm file.
-    my $dumbpath = $dist;
-    $dumbpath =~ s/\A.+-//;
-    $dumbpath .= ".pm";
-
-    my @paths = ($libpath, $dumbpath);
-    # Some modules (with simple names like XSLoader, lib, etc) are
-    # generated by Makefile.PL. Search through their generating code.
-    push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0;
-
-    for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; }
-    return undef;
-}
-
-sub module_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = maindistfile($dist, $dir) or return undef;
-
-    my $mod = $dist;
-    $mod =~ s/-/::/g;
-    my $ver = Common::evalver($path, $mod);
-    unless ($ver) {
-        warn "failed to find version in module file for $dist\n";
-        return undef;
-    }
-
-    return $ver;
-}
-
-sub changelog_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path;
-    for my $tmp (glob "$dir/{Changes,ChangeLog}") {
-        if (-f $tmp) { $path = $tmp; last; }
-    }
-    return undef unless $path;
-
-    open my $fh, '<', $path or die "open: $!";
-    while (<$fh>) {
-        return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/;
-        return $1 if /\A\s*version\s+([0-9._]+)/i;
-    }
-    close $fh;
-
-    return undef;
-}
-
-# for some reason podlators has a VERSION file with perl code in it
-sub verfile_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = "$dir/VERSION";
-    return undef unless -f $path; # no warning, only podlaters has it
-
-    return Common::evalver($path);
-}
-
-# scans a directory full of nicely separated dist. directories.
-sub scan_distroot
-{
-    my ($distroot) = @_;
-    opendir my $cpand, "$distroot" or die "failed to open $distroot";
-    my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand;
-    closedir $cpand;
-
-    my @found;
-    for my $dist (@dists) {
-        my $distdir = "$distroot/$dist";
-        my $ver = (module_ver($dist, $distdir)
-                   || changelog_ver($dist, $distdir)
-                   || verfile_ver($dist, $distdir));
-
-        if ($ver) { push @found, [ $dist, $ver ]; }
-        else { warn "failed to find version for $dist\n"; }
-    }
-    return @found;
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}";
-}
-
-#-----------------------------------------------------------------------------
-
-package Modules;
-
-use HTTP::Tiny qw();
-use File::Find qw();
-use File::stat;
-
-*findfile = *File::Find::find;
-
-sub cpan_provider
-{
-    my ($module) = @_;
-    my $url = "http://cpanmetadb.plackperl.org/v1.0/package/$module";
-    my $http = HTTP::Tiny->new;
-    my $resp = $http->get($url);
-    return undef unless $resp->{'success'};
-
-    my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m
-        or return undef;
-
-    my $dist = $cpanpath;
-    $dist =~ s{\A.+/}{};    # remove author directory
-    $dist =~ s{-[^-]+\z}{}; # remove version and extension
-    return ($dist eq 'perl' ? undef : $dist);
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    my $libdir = "$srcdir/lib/";
-    die "failed to find $libdir directory" unless -d $libdir;
-
-    # Find only the module files that have not changed since perl
-    # was extracted. We don't want the files perl just recently
-    # installed into lib/. We processed those already.
-    my @modfiles;
-    my $finder = sub {
-        return unless /[.]pm\z/;
-        return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules
-        push @modfiles, $_;
-    };
-    findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir);
-
-    # First we have to find what the oldest ctime actually is.
-    my $oldest = time;
-    @modfiles = map {
-        my $modfile = $_;
-        my $ctime = (stat $modfile)->ctime;
-        $oldest = $ctime if $ctime < $oldest;
-        [ $modfile, $ctime ]; # save ctime for later
-    } @modfiles;
-
-    # Then we filter out any file that was created more than a
-    # few seconds after that. Process the rest.
-    my @mods;
-    for my $modfile (@modfiles) {
-        my ($mod, $ctime) = @$modfile;
-        next if $ctime - $oldest > 5; # ignore newer files
-
-        my $path = $mod;
-        $mod =~ s{[.]pm\z}{};
-        $mod =~ s{\A$libdir}{};
-        $mod =~ s{/}{::}g;
-
-        my $ver = Common::evalver($path, $mod) || q{};
-        push @mods, [ $mod, $ver ];
-    }
-
-    # Convert modules names to the dist names who provide them.
-    my %seen;
-    my @dists;
-    for my $modref (@mods) {
-        my ($mod, $ver) = @$modref;
-        my $dist = cpan_provider($mod) or next; # filter out core modules
-        next if $seen{$dist}++;                 # avoid duplicate dists
-        push @dists, [ $dist, $ver ];
-    }
-    return @dists;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dist2Pkg;
-
-sub name
-{
-    my ($name) = @_;
-    my $orig = $name;
-
-    # Package names should be lowercase and consist of alphanumeric
-    # characters only (and hyphens!)...
-    $name =~ tr/A-Z/a-z/;
-    $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap)
-    $name =~ tr/-a-z0-9+//cd; # Delete all other chars.
-    $name =~ tr/-/-/s;
-
-    # Delete leading or trailing hyphens...
-    $name =~ s/\A-|-\z//g;
-
-    die qq{Dist. name '$orig' completely violates packaging standards}
-        unless $name;
-
-    return "perl-$name";
-}
-
-sub version
-{
-    my ($version) = @_;
-
-    # Package versions should be numbers and decimal points only...
-    $version =~ tr/-/./;
-    $version =~ tr/_0-9.-//cd;
-
-    # Remove developer versions because pacman has no special logic
-    # to compare them to regular versions like perl does.
-    $version =~ s/_[^_]+\z//;
-
-    $version =~ tr/_//d;  # delete other underscores
-    $version =~ tr/././s; # only one period at a time
-    $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period
-
-    return $version;
-}
-
-#-----------------------------------------------------------------------------
-
-package main;
-
-my %CPANNAME = ('List-Util' => 'Scalar-List-Utils',
-                'Text-Tabs' => 'Text-Tabs+Wrap',
-                'Cwd'       => 'PathTools');
-
-my $perldir = shift or die "Usage: $0 [path to perl source directory]\n";
-die "$perldir is not a valid directory." unless -d $perldir;
-
-my @dists = (Dists::find($perldir), Modules::find($perldir));
-for my $dist (@dists) {
-    my $name = $dist->[0];
-    $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name};
-}
-
-my @pkgs = map {
-    my ($name, $ver) = @$_;
-    $name = Dist2Pkg::name($name);
-    $ver  = Dist2Pkg::version($ver);
-    [ $name, $ver ];
-} @dists;
-
-@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs;
-
-for my $pkg (@pkgs) {
-    my ($name, $ver) = @$pkg;
-    print "$name=$ver\n";
-}
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
deleted file mode 100644
index ed3272ed3..000000000
--- a/testing/php/PKGBUILD
+++ /dev/null
@@ -1,347 +0,0 @@
-# $Id: PKGBUILD 169085 2012-10-17 19:12:34Z pierre $
-# 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.4.8
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('PHP')
-url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
-             'sqlite' '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"
-        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('bb8c816a9299be8995255ef70c63b800'
-         '0b0bc7a917fc592bdf11dcd3c5c255e9'
-         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         '3cfde0cc4ed09b55f1ce531437a4eb88'
-         '5c1f4c967b66ce3eaf819b46951dcbf5'
-         'f56b5bb7e93c802ae8519182fbea3387'
-         'f8b206cb8fecb05cb1ded8bee45633ff'
-         'c60343df74f8e1afb13b084d5c0e47ed')
-
-build() {
-	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
-		--config-cache \
-		--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 \
-		--disable-rpath \
-		--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-mbstring \
-		--enable-phar=shared \
-		--enable-posix=shared \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--enable-zip=shared \
-		--with-bz2=shared \
-		--with-curl=shared \
-		--with-db4=/usr \
-		--with-enchant=shared,/usr \
-		--with-freetype-dir=/usr \
-		--with-gd=shared \
-		--with-gdbm \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-icu-dir=/usr \
-		--with-imap-ssl \
-		--with-imap=shared \
-		--with-jpeg-dir=/usr \
-		--with-vpx-dir=/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=/usr \
-		--with-pspell=shared \
-		--with-snmp=shared \
-		--with-sqlite3=shared,/usr \
-		--with-tidy=shared \
-		--with-unixODBC=shared,/usr \
-		--with-xmlrpc=shared \
-		--with-xsl=shared \
-		--with-zlib \
-		"
-
-	EXTENSION_DIR=/usr/lib/php/modules
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear
-	export PEAR_INSTALLDIR
-
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# 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='php-fpm.install'
-
-	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
-	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
-	install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service
-}
-
-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 install-pear INSTALL_ROOT=${pkgdir}
-	rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
-}
-
-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' 'libvpx')
-	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' 'sqlite')
-	pkgdesc='sqlite 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 ac2d92a36..000000000
--- a/testing/php/logrotate.d.php-fpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/php-fpm.log {
-	missingok
-	notifempty
-	delaycompress
-	postrotate
-		kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/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 d618fca4e..000000000
--- a/testing/php/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- sapi/fpm/php-fpm.conf.in	2012-08-15 06:26:05.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-08-16 14:17:41.809663595 +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
- ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -148,7 +148,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 = /run/php-fpm/php-fpm.sock
- 
- ; Set listen(2) backlog.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -159,9 +160,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
-  
- ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
- ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -458,7 +459,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-fpm.install b/testing/php/php-fpm.install
deleted file mode 100644
index 41fc37c22..000000000
--- a/testing/php/php-fpm.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-	if [[ ! -d run/php-fpm ]]; then
-		usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf
-	fi
-}
-
-post_upgrade() {
-	post_install
-}
diff --git a/testing/php/php-fpm.service b/testing/php/php-fpm.service
deleted file mode 100644
index fc5ead6f3..000000000
--- a/testing/php/php-fpm.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=The PHP FastCGI Process Manager
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/php-fpm/php-fpm.pid
-PrivateTmp=true
-ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
-ExecReload=/bin/kill -USR2 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/php/php-fpm.tmpfiles b/testing/php/php-fpm.tmpfiles
deleted file mode 100644
index 801e74f1e..000000000
--- a/testing/php/php-fpm.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/php-fpm 755 root root
diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch
deleted file mode 100644
index bbaae2152..000000000
--- a/testing/php/php.ini.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- php.ini-production	2012-03-29 06:17:59.000000000 +0200
-+++ php.ini-production	2012-03-30 10:46:21.181340861 +0200
-@@ -305,7 +305,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
-@@ -702,7 +702,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -725,7 +725,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"
- 
-@@ -859,51 +859,47 @@
- ; 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 11gR2 Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.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_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=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=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 a8cb9eca9..000000000
--- a/testing/php/rc.d.php-fpm
+++ /dev/null
@@ -1,144 +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
-
-	stat_done
-}
-
-case "$1" in
-	start)
-		test_config
-		stat_busy 'Starting php-fpm'
-
-		/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
-
-		if [ "$?" != 0 ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		wait_for_pid created /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 /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -QUIT `cat /run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /run/php-fpm/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 /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -TERM `cat /run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /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 /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR2 `cat /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/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD
deleted file mode 100644
index f87f625dd..000000000
--- a/testing/pidgin/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# $Id: PKGBUILD 169161 2012-10-18 19:22:57Z jgc $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.6
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pidgin.im/"
-license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
-             'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'avahi'
-             'tk' 'ca-certificates' 'intltool'
-             'networkmanager')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' */plugins/*.py \
-    libpurple/purple-{remote,notifications-example,url-handler}
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-schemas-install \
-    --disable-meanwhile \
-    --disable-gnutls \
-    --enable-cyrus-sasl \
-    --disable-doxygen \
-    --enable-nm \
-    --disable-vv \
-    --with-python=/usr/bin/python2 \
-    --with-system-ssl-certs=/etc/ssl/certs
-    make
-}
-
-package_pidgin(){
-  pkgdesc="Multi-protocol instant messaging client"
-  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-           'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction')
-  install=pidgin.install
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C pidgin DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
-
-  rm "$pkgdir/usr/share/man/man1/finch.1"
-}
-
-package_libpurple(){
-  pkgdesc="IM library extracted from Pidgin"
-  depends=('gstreamer0.10' 'libsasl' 'libidn' 'dbus-glib' 'nss')
-  optdepends=('avahi: Bonjour protocol support'
-              'ca-certificates: SSL CA certificates'
-              'python2-dbus: for purple-remote and purple-url-handler'
-              'tk: Tcl/Tk scripting support')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
-    make -C "$_dir" DESTDIR="$pkgdir" install
-  done
-}
-
-package_finch(){
-  pkgdesc="A ncurses-based messaging client"
-  depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C finch DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/pidgin/pidgin.install b/testing/pidgin/pidgin.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/testing/pidgin/pidgin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/pinentry/PKGBUILD b/testing/pinentry/PKGBUILD
deleted file mode 100644
index b1c76c880..000000000
--- a/testing/pinentry/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 166441 2012-09-07 20:18:41Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pinentry
-pkgver=0.8.2
-pkgrel=1
-pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnupg.org/aegypten2"
-depends=('ncurses' 'libcap>=2.16')
-makedepends=('gtk2' 'qt')
-optdepends=('gtk2: for gtk2 backend'
-            'qt: for qt4 backend')  
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
-        qt4-pinentry-window.patch)
-install=pinentry.install
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  #fix: https://bugs.archlinux.org/task/29998
-  patch -Np1 -i ../qt4-pinentry-window.patch
-  for file in qt4/*.moc; do
-       /usr/bin/moc ${file/.moc/.h} > ${file}
-   done
-  ./configure --prefix=/usr \
-	--enable-pinentry-curses \
-        --disable-pinentry-gtk \
-        --disable-pinentry-qt \
-	--enable-pinentry-gtk2 \
-        --enable-pinentry-qt4 \
-	--enable-fallback-curses
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install 
-}
-md5sums=('82e6114e5e27a8ab36f314b332a6e024'
-         '450b8713fe42f1bd93311ef84767c3d8')
diff --git a/testing/pinentry/pinentry.install b/testing/pinentry/pinentry.install
deleted file mode 100644
index eed2c7124..000000000
--- a/testing/pinentry/pinentry.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(pinentry.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/pinentry/qt4-pinentry-window.patch b/testing/pinentry/qt4-pinentry-window.patch
deleted file mode 100644
index 8f9faae11..000000000
--- a/testing/pinentry/qt4-pinentry-window.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 1 Feb 2011 14:42:27 +0100
-Subject: [PATCH] Fix qt4 pinentry window created in the background
-
-This is probably just a workaround. Proper fix is being investigated.
-See:
-https://bugzilla.redhat.com/show_bug.cgi?id=589532
-http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background
----
- qt4/pinentrydialog.cpp |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
-index 541baf4..d634eb6 100644
---- a/qt4/pinentrydialog.cpp
-+++ b/qt4/pinentrydialog.cpp
-@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w )
-     SetForegroundWindow( w->winId() );
- #endif
-     w->raise();
--    w->activateWindow();
- }
- 
- QPixmap icon( QStyle::StandardPixmap which )
--- 
-1.7.3.5
-
diff --git a/testing/pkg-config/PKGBUILD b/testing/pkg-config/PKGBUILD
deleted file mode 100644
index 0db10d836..000000000
--- a/testing/pkg-config/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165565 2012-08-25 05:11:36Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=pkg-config
-pkgver=0.27.1
-pkgrel=1
-pkgdesc="A system for managing library compile/link flags"
-arch=('i686' 'x86_64')
-url="http://pkgconfig.freedesktop.org/wiki/"
-license=('GPL')
-groups=('base-devel')
-depends=('glib2')
-provides=("pkgconfig=${pkgver}")
-conflicts=('pkgconfig')
-replaces=('pkgconfig')
-source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5392b4e3372879c5bf856173b418d6a2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/polkit/PKGBUILD b/testing/polkit/PKGBUILD
deleted file mode 100644
index 70bb6e4d8..000000000
--- a/testing/polkit/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 169160 2012-10-18 19:22:54Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=polkit
-pkgver=0.107
-pkgrel=4
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
-options=('!libtool')
-install=polkit.install
-source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam fix-empty-wheel.patch)
-md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
-         '6564f95878297b954f0572bc1610dd15'
-         'c99ab2a7919ad0b69fde4804c043b07f')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # https://bugs.archlinux.org/task/31717
-  patch -Np1 -i ../fix-empty-wheel.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static --enable-gtk-doc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  chown 102 "$pkgdir/etc/polkit-1/rules.d"
-  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
-
-  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
-}
diff --git a/testing/polkit/autogen.sh b/testing/polkit/autogen.sh
deleted file mode 100755
index d08b00a49..000000000
--- a/testing/polkit/autogen.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory $srcdir does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-olddir=`pwd`
-cd "$srcdir"
-
-touch ChangeLog
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoconf installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
-  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have libtool installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have automake installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing aclocal.  The version of automake"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-
-# if no automake, don't bother testing for autoreconf
-test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoreconf installed."
-  echo "You can get autoreconf from ..."
-  DIE=1
-}
-
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run configure with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo $0 " command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      echo "Running autoreconf on test/mocklibc ..."
-      (cd "test/mocklibc"; autoreconf --install)
-
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu -Wno-portability $am_opt ..."
-      automake --add-missing --gnu -Wno-portability $am_opt
-      echo "Running autoconf ..."
-      autoconf
-
-intltoolize --copy --force --automake                  || exit 1
-
-cd "$olddir"
-
-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-
-if test x$NOCONFIGURE = x; then
-  echo "Running $srcdir/configure $conf_flags $@ ..."
-  $srcdir/configure $conf_flags "$@" \
-  && echo "Now type make to compile." || exit 1
-else
-  echo "Skipping configure process."
-fi
diff --git a/testing/polkit/fix-empty-wheel.patch b/testing/polkit/fix-empty-wheel.patch
deleted file mode 100644
index d6f99c43d..000000000
--- a/testing/polkit/fix-empty-wheel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Tue, 18 Sep 2012 18:47:06 +0000
-Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty
-
-For example, this can happen if the wheel group has no members. This
-was reported in Red Hat bug 834494, see
-
- https://bugzilla.redhat.com/show_bug.cgi?id=834494
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
-index 1d4a555..3bd2f0b 100644
---- a/src/polkitbackend/polkitbackendinteractiveauthority.c
-+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
-@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract
-                                                            PolkitDetails                     *details)
- {
-   PolkitBackendInteractiveAuthorityClass *klass;
--  GList *ret;
-+  GList *ret = NULL;
- 
-   klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority);
- 
--  if (klass->get_admin_identities == NULL)
--    {
--      ret = g_list_prepend (NULL, polkit_unix_user_new (0));
--    }
--  else
-+  if (klass->get_admin_identities != NULL)
-     {
-       ret = klass->get_admin_identities (authority,
-                                          caller,
-@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent         *agent,
-         }
-     }
- 
-+  /* Fall back to uid 0 if no users are available (rhbz #834494) */
-+  if (user_identities == NULL)
-+    user_identities = g_list_prepend (NULL, polkit_unix_user_new (0));
-+
-   session = authentication_session_new (agent,
-                                         cookie,
-                                         subject,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/polkit/logind+ConsoleKit.patch b/testing/polkit/logind+ConsoleKit.patch
deleted file mode 100644
index 042d1043a..000000000
--- a/testing/polkit/logind+ConsoleKit.patch
+++ /dev/null
@@ -1,638 +0,0 @@
-From ba143769e17e4bbc1f2b0c88e735f993dfb3c873 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Tue, 7 Aug 2012 21:06:18 +0200
-Subject: [PATCH] session tracking: always require consolekit
-
-Only systemd is now optional at compile-time, and if enabled we fallback to consolekit
-at runtime, if not booted with systemd.
-
-Bits-stolen-from: Jan Alexander Steffens <jan.steffens@gmail.com>
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- configure.ac                                       |   6 +-
- src/polkit/polkitunixsession-systemd.c             |  96 ++++++-
- src/polkitbackend/polkitbackendjsauthority.c       |  10 +-
- .../polkitbackendsessionmonitor-systemd.c          | 313 +++++++++++++++++++--
- 4 files changed, 380 insertions(+), 45 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7a0d938..1d1e4ba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -163,15 +163,15 @@ AC_ARG_ENABLE([libsystemd-login],
-               [enable_libsystemd_login=auto])
- if test "$enable_libsystemd_login" != "no"; then
-   PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN,
--                    [libsystemd-login],
-+                    [libsystemd-login libsystemd-daemon],
-                     have_libsystemd_login=yes,
-                     have_libsystemd_login=no)
-   if test "$have_libsystemd_login" = "yes"; then
--    SESSION_TRACKING=libsystemd-login
-+    SESSION_TRACKING="libsystemd-login (with ConsoleKit runtime fallback)"
-     AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
-   else
-     if test "$enable_libsystemd_login" = "yes"; then
--      AC_MSG_ERROR([libsystemd-login support requested but libsystemd-login library not found])
-+      AC_MSG_ERROR([libsystemd-login support requested but systemd libraries not found])
-     fi
-   fi
- fi
-diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c
-index 8a8bf65..bb89044 100644
---- a/src/polkit/polkitunixsession-systemd.c
-+++ b/src/polkit/polkitunixsession-systemd.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2011 Red Hat, Inc.
-+ * Copyright (C) 2008, 2011 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -17,6 +17,7 @@
-  * Boston, MA 02111-1307, USA.
-  *
-  * Author: Matthias Clasen
-+ * Author: David Zeuthen <davidz@redhat.com>
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -31,6 +32,7 @@
- #include "polkitprivate.h"
- 
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- 
- /**
-  * SECTION:polkitunixsession
-@@ -367,9 +369,41 @@ polkit_unix_session_exists_sync (PolkitSubject   *subject,
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
-   gboolean ret = FALSE;
-   uid_t uid;
-+  GDBusConnection *connection; /* consolekit */
-+  GVariant *result; /* consolekit */
- 
--  if (sd_session_get_uid (session->session_id, &uid) == 0)
--    ret = TRUE;
-+  if (sd_booted())
-+    {
-+      if (sd_session_get_uid (session->session_id, &uid) == 0)
-+      ret = TRUE;
-+    }
-+  else /* consolekit */
-+    {
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            session->session_id,                    /* object path */
-+                                            "org.freedesktop.ConsoleKit.Session",   /* interface name */
-+                                            "GetUser",                              /* method */
-+                                            NULL, /* parameters */
-+                                            G_VARIANT_TYPE ("(u)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
-+
-+      ret = TRUE;
-+      g_variant_unref (result);
-+
-+     out:
-+      if (connection != NULL)
-+        g_object_unref (connection);
-+    }
- 
-   return ret;
- }
-@@ -451,29 +485,61 @@ polkit_unix_session_initable_init (GInitable     *initable,
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
-   gboolean ret = FALSE;
-   char *s;
-+  GDBusConnection *connection; /* consolekit */
-+  GVariant *result; /* consolekit */
-+  connection = NULL; /* consolekit */
- 
-   if (session->session_id != NULL)
-     {
-       /* already set, nothing to do */
--      ret = TRUE;
--      goto out;
-+      return TRUE;
-     }
- 
--  if (sd_pid_get_session (session->pid, &s) == 0)
-+  if (sd_booted())
-+    {
-+      if (sd_pid_get_session (session->pid, &s) == 0)
-+        {
-+          session->session_id = g_strdup (s);
-+          free (s);
-+          return TRUE;
-+        }
-+
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "No session for pid %d",
-+                  (gint) session->pid);
-+    }
-+  else /* consolekit */
-     {
--      session->session_id = g_strdup (s);
--      free (s);
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            "/org/freedesktop/ConsoleKit/Manager",  /* object path */
-+                                            "org.freedesktop.ConsoleKit.Manager",   /* interface name */
-+                                            "GetSessionForUnixProcess",             /* method */
-+                                            g_variant_new ("(u)", session->pid),    /* parameters */
-+                                            G_VARIANT_TYPE ("(o)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
-+
-+      g_variant_get (result, "(o)", &session->session_id);
-+      g_variant_unref (result);
-+
-       ret = TRUE;
--      goto out;
-     }
- 
--  g_set_error (error,
--               POLKIT_ERROR,
--               POLKIT_ERROR_FAILED,
--               "No session for pid %d",
--               (gint) session->pid);
-+ out:
-+  if (connection != NULL) /* consolekit */
-+    g_object_unref (connection);
- 
--out:
-   return ret;
- }
- 
-diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c
-index bdfaa73..ee38739 100644
---- a/src/polkitbackend/polkitbackendjsauthority.c
-+++ b/src/polkitbackend/polkitbackendjsauthority.c
-@@ -36,6 +36,7 @@
- 
- #ifdef HAVE_LIBSYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- #endif /* HAVE_LIBSYSTEMD_LOGIN */
- 
- #include <jsapi.h>
-@@ -731,11 +732,14 @@ subject_to_jsval (PolkitBackendJsAuthority  *authority,
-     }
- 
- #ifdef HAVE_LIBSYSTEMD_LOGIN
--  if (sd_pid_get_session (pid, &session_str) == 0)
-+  if (sd_booted())
-     {
--      if (sd_session_get_seat (session_str, &seat_str) == 0)
-+      if (sd_pid_get_session (pid, &session_str) == 0)
-         {
--          /* do nothing */
-+          if (sd_session_get_seat (session_str, &seat_str) == 0)
-+            {
-+              /* do nothing */
-+            }
-         }
-     }
- #endif /* HAVE_LIBSYSTEMD_LOGIN */
-diff --git a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-index 58593c3..5114dfa 100644
---- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-+++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-@@ -26,11 +26,15 @@
- #include <string.h>
- #include <glib/gstdio.h>
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- #include <stdlib.h>
- 
- #include <polkit/polkit.h>
- #include "polkitbackendsessionmonitor.h"
- 
-+/* consolekit */
-+#define CKDB_PATH "/var/run/ConsoleKit/database"
-+
- /* <internal>
-  * SECTION:polkitbackendsessionmonitor
-  * @title: PolkitBackendSessionMonitor
-@@ -126,6 +130,11 @@ struct _PolkitBackendSessionMonitor
-   GDBusConnection *system_bus;
- 
-   GSource *sd_source;
-+
-+  /* consolekit */
-+  GKeyFile *database;
-+  GFileMonitor *database_monitor;
-+  time_t database_mtime;
- };
- 
- struct _PolkitBackendSessionMonitorClass
-@@ -148,6 +157,101 @@ G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TY
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+/* consolekit */
-+static gboolean
-+reload_database (PolkitBackendSessionMonitor  *monitor,
-+                 GError                      **error)
-+{
-+  gboolean ret;
-+  struct stat statbuf;
-+
-+  ret = FALSE;
-+
-+  if (monitor->database != NULL)
-+    {
-+      g_key_file_free (monitor->database);
-+      monitor->database = NULL;
-+    }
-+
-+  if (stat (CKDB_PATH, &statbuf) != 0)
-+    {
-+      g_set_error (error,
-+                   G_IO_ERROR,
-+                   g_io_error_from_errno (errno),
-+                   "Error statting file " CKDB_PATH ": %s",
-+                   strerror (errno));
-+      goto out;
-+    }
-+
-+  monitor->database_mtime = statbuf.st_mtime;
-+
-+  monitor->database = g_key_file_new ();
-+  if (!g_key_file_load_from_file (monitor->database,
-+                                  CKDB_PATH,
-+                                  G_KEY_FILE_NONE,
-+                                  error))
-+    {
-+      goto out;
-+    }
-+
-+  ret = TRUE;
-+
-+ out:
-+  return ret;
-+}
-+
-+static gboolean
-+ensure_database (PolkitBackendSessionMonitor  *monitor,
-+		                 GError                      **error)
-+{
-+  gboolean ret = FALSE;
-+
-+  if (monitor->database != NULL)
-+    {
-+      struct stat statbuf;
-+
-+      if (stat (CKDB_PATH, &statbuf) != 0)
-+        {
-+          g_set_error (error,
-+                       G_IO_ERROR,
-+                       g_io_error_from_errno (errno),
-+                       "Error statting file " CKDB_PATH " to check timestamp: %s",
-+                       strerror (errno));
-+          goto out;
-+        }
-+      if (statbuf.st_mtime == monitor->database_mtime)
-+        {
-+          ret = TRUE;
-+          goto out;
-+        }
-+    }
-+
-+  ret = reload_database (monitor, error);
-+
-+ out:
-+  return ret;
-+}
-+
-+static void
-+on_file_monitor_changed (GFileMonitor     *file_monitor,
-+                         GFile            *file,
-+                         GFile            *other_file,
-+                         GFileMonitorEvent event_type,
-+                         gpointer          user_data)
-+{
-+  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
-+
-+  /* throw away cache */
-+  if (monitor->database != NULL)
-+    {
-+      g_key_file_free (monitor->database);
-+      monitor->database = NULL;
-+    }
-+  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
-+}
-+
-+/* consolekit - end */
-+
- static gboolean
- sessions_changed (gpointer user_data)
- {
-@@ -163,6 +267,7 @@ static void
- polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
- {
-   GError *error;
-+  GFile *file; /* consolekit */
- 
-   error = NULL;
-   monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-@@ -172,9 +277,41 @@ polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
-       g_error_free (error);
-     }
- 
--  monitor->sd_source = sd_source_new ();
--  g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--  g_source_attach (monitor->sd_source, NULL);
-+  if (sd_booted())
-+    {
-+      monitor->sd_source = sd_source_new ();
-+      g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+      g_source_attach (monitor->sd_source, NULL);
-+    }
-+  else /* consolekit */
-+    {
-+      error = NULL;
-+      if (!ensure_database (monitor, &error))
-+        {
-+          g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+
-+      error = NULL;
-+      file = g_file_new_for_path (CKDB_PATH);
-+      monitor->database_monitor = g_file_monitor_file (file,
-+                                                       G_FILE_MONITOR_NONE,
-+                                                       NULL,
-+                                                       &error);
-+      g_object_unref (file);
-+      if (monitor->database_monitor == NULL)
-+        {
-+          g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+      else
-+        {
-+          g_signal_connect (monitor->database_monitor,
-+                            "changed",
-+                            G_CALLBACK (on_file_monitor_changed),
-+                            monitor);
-+        }
-+    }
- }
- 
- static void
-@@ -191,6 +328,14 @@ polkit_backend_session_monitor_finalize (GObject *object)
-       g_source_unref (monitor->sd_source);
-     }
- 
-+  /* consolekit */
-+  if (monitor->database_monitor != NULL)
-+    g_object_unref (monitor->database_monitor);
-+
-+  if (monitor->database != NULL)
-+    g_key_file_free (monitor->database);
-+  /* consolekit - end */
-+
-   if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL)
-     G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object);
- }
-@@ -258,6 +403,8 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
-                                                      GError                      **error)
- {
-   PolkitIdentity *ret;
-+  GError *local_error; /* consolekit */
-+  gchar *group; /* consolekit */
-   guint32 uid;
- 
-   ret = NULL;
-@@ -300,16 +447,38 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
- 
--      if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
-+      if (sd_booted())
-         {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Error getting uid for session");
--          goto out;
-+          if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
-+            {
-+              g_set_error (error,
-+                           POLKIT_ERROR,
-+                           POLKIT_ERROR_FAILED,
-+                           "Error getting uid for session");
-+              goto out;
-+            }
-+
-+          ret = polkit_unix_user_new (uid);
-+        }
-+      else /* consolekit */
-+        {
-+          if (!ensure_database (monitor, error))
-+            {
-+              g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
-+              goto out;
-+            }
-+
-+         group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
-+         local_error = NULL;
-+         uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
-+         if (local_error != NULL)
-+           {
-+             g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
-+             g_free (group);
-+             goto out;
-+           }
-+         g_free (group);
-         }
--
--      ret = polkit_unix_user_new (uid);
-     }
- 
-  out:
-@@ -337,20 +506,43 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      gchar *session_id;
--      pid_t pid;
-+      if (sd_booted())
-+        {
-+          gchar *session_id;
-+          pid_t pid;
- 
--      pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
-+          pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+          goto out;
- 
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+	}
-+      else /* consolekit */
-+        {
-+          const gchar *session_id;
-+          GVariant *result;
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                                -1, /* timeout_msec */
-+                                                NULL, /* GCancellable */
-+                                                error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
-     {
-       guint32 pid;
--      gchar *session_id;
-       GVariant *result;
- 
-       result = g_dbus_connection_call_sync (monitor->system_bus,
-@@ -369,11 +561,35 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
-       g_variant_get (result, "(u)", &pid);
-       g_variant_unref (result);
- 
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
-+      if (sd_booted())
-+        {
-+          gchar *session_id;
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+            goto out;
- 
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+        }
-+      else /* consolekit */
-+        {
-+          const gchar *session_id;
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", pid),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                               -1, /* timeout_msec */
-+                                               NULL, /* GCancellable */
-+                                               error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else
-     {
-@@ -389,12 +605,58 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
-   return session;
- }
- 
-+static gboolean
-+get_boolean (PolkitBackendSessionMonitor *monitor,
-+             PolkitSubject               *session,
-+             const gchar                 *key_name)
-+{
-+  gboolean ret;
-+  gchar *group;
-+  GError *error;
-+
-+  ret = FALSE;
-+
-+  group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+
-+  error = NULL;
-+  if (!ensure_database (monitor, &error))
-+    {
-+      g_printerr ("Error getting boolean `%s' in group `%s': Error ensuring CK database at " CKDB_PATH ": %s",
-+                  key_name,
-+                  group,
-+                  error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+
-+  error = NULL;
-+  ret = g_key_file_get_boolean (monitor->database, group, key_name, &error);
-+  if (error != NULL)
-+    {
-+      g_printerr ("Error looking %s using " CKDB_PATH " for %s: %s\n",
-+                  key_name,
-+                  group,
-+                  error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+
-+ out:
-+  g_free (group);
-+  return ret;
-+}
-+
- gboolean
- polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor,
-                                                  PolkitSubject               *session)
- {
-   char *seat;
- 
-+  if (!sd_booted()) /* consolekit */
-+    {
-+      return get_boolean (monitor, session, "is_local");
-+    }
-+
-   if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
-     {
-       free (seat);
-@@ -409,6 +671,9 @@ gboolean
- polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
-                                                   PolkitSubject               *session)
- {
--  return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+  if (sd_booted())
-+    return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+  else /* consolekit */
-+    return get_boolean (monitor, session, "is_active");
- }
- 
--- 
-1.7.11.4
-
diff --git a/testing/polkit/polkit.install b/testing/polkit/polkit.install
deleted file mode 100644
index fbb98919e..000000000
--- a/testing/polkit/polkit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-       getent group polkitd >/dev/null || groupadd -g 102 polkitd
-       getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
-       passwd -l polkitd &>/dev/null
-}
-
-post_upgrade() {
-       post_install
-}
-
-post_remove() {
-       if getent passwd polkitd >/dev/null; then
-               userdel polkitd
-       fi
-       if getent group polkitd >/dev/null; then
-               groupdel polkitd
-       fi
-}
diff --git a/testing/polkit/polkit.pam b/testing/polkit/polkit.pam
deleted file mode 100644
index 04f53e0db..000000000
--- a/testing/polkit/polkit.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD
deleted file mode 100644
index 790887f28..000000000
--- a/testing/poppler/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 169325 2012-10-19 13:28:44Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.20.5
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu')
-options=('!libtool' '!emptydirs')
-url="http://poppler.freedesktop.org/"
-_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
-        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('8a80ae83eb7a327b031808d09ee1d54d'
-         '9dc64c254a31e570507bdd4ad4ba629a')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-
-  autoreconf -fi
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-cairo-output \
-      --enable-xpdf-headers \
-      --enable-libjpeg --enable-zlib \
-      --enable-poppler-qt4 \
-      --enable-poppler-glib
-  make
-}
-
-check() {
-  cd "${srcdir}"
-  ln -sf test-${_testtag} test
-  cd ${pkgbase}-${pkgver}
-  LANG=en_US.UTF8 make check || /bin/true
-}
-
-package_poppler() {
-  pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
-  conflicts=("poppler-qt3<${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
-}
-
-package_poppler-glib() {
-  pkgdesc="Poppler glib bindings"
-  depends=("poppler=${pkgver}" 'glib2')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
-}
-
-package_poppler-qt() {
-  pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
diff --git a/testing/postfix/PKGBUILD b/testing/postfix/PKGBUILD
deleted file mode 100644
index 2a2e80e52..000000000
--- a/testing/postfix/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 163102 2012-07-07 03:16:44Z bisson $
-# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=postfix
-pkgver=2.9.3
-pkgrel=2
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libldap' 'db'
-         'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb')
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
-        'aliases.patch' \
-        'rc.d')
-sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d'
-          '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-conflicts=('smtp-server' 'smtp-forwarder')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make makefiles DEBUG='' CCARGS=' \
-		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
-		-DHAS_LDAP \
-		-DUSE_TLS \
-		-DHAS_MYSQL -I/usr/include/mysql \
-		-DHAS_PGSQL -I/usr/include/postgresql \
-		-DHAS_SQLITE \
-		-DHAS_CDB \
-	' AUXLIBS=' \
-		-lsasl2 \
-		-lldap -llber \
-		-lssl -lcrypto \
-		-lmysqlclient -lz -lm \
-		-lpq \
-		-lsqlite3 -lpthread \
-		-lcdb \
-	' OPT="${CFLAGS} ${LDFLAGS}"
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sh postfix-install -non-interactive \
-		install_root="${pkgdir}" \
-		daemon_directory="/usr/lib/${pkgname}" \
-		sample_directory="/etc/${pkgname}/sample" \
-		manpage_directory="/usr/share/man" \
-		readme_directory="/usr/share/doc/${pkgname}" \
-
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
-	cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
-}
diff --git a/testing/postfix/aliases.patch b/testing/postfix/aliases.patch
deleted file mode 100644
index 6767870b7..000000000
--- a/testing/postfix/aliases.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/postfix/main.cf.orig	2010-12-13 20:18:22.000000000 +0100
-+++ etc/postfix/main.cf	2010-12-13 20:18:24.000000000 +0100
-@@ -382,6 +382,7 @@
- #alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
-+alias_maps = hash:/etc/postfix/aliases
- 
- # The alias_database parameter specifies the alias database(s) that
- # are built with "newaliases" or "sendmail -bi".  This is a separate
-@@ -392,6 +393,7 @@
- #alias_database = dbm:/etc/mail/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+alias_database = $alias_maps
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
- #
diff --git a/testing/postfix/install b/testing/postfix/install
deleted file mode 100644
index cb97e2e6c..000000000
--- a/testing/postfix/install
+++ /dev/null
@@ -1,33 +0,0 @@
-post_install() {
-	getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
-	getent group postfix  &>/dev/null || groupadd -g 73 postfix  >/dev/null
-	getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
-	cd var/spool/postfix
-	chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
-	chgrp postdrop public maildrop
-	cd ../../../usr/sbin
-	chgrp postdrop postqueue postdrop
-	chmod g+s postqueue postdrop
-	cd ../..
-	chown postfix var/lib/postfix
-
-	newaliases
-}
-
-post_upgrade() {
-	post_install
-
-	if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF
-
-==> You must now run "postfix reload" due to inter-daemon protocol change.
-
-EOF
-	fi
-}
-
-pre_remove() {
-	getent passwd postfix &>/dev/null && userdel  postfix  >/dev/null
-	getent group postfix  &>/dev/null && groupdel postfix  >/dev/null
-	getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
-}
diff --git a/testing/postfix/rc.d b/testing/postfix/rc.d
deleted file mode 100755
index fa314bb84..000000000
--- a/testing/postfix/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=postfix
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	/usr/sbin/postfix start &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	/usr/sbin/postfix stop &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	/usr/sbin/postfix reload &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/testing/postgresql-old-upgrade/PKGBUILD b/testing/postgresql-old-upgrade/PKGBUILD
deleted file mode 100644
index 0334899a9..000000000
--- a/testing/postgresql-old-upgrade/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 166685 2012-09-15 16:03:08Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=postgresql-old-upgrade
-pkgver=9.1.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=('c784decb60615aa94c6a31601bc6ffd2')
-sha256sums=('0b889c132426fc68d8c2eb1bf112bf99cc653e9c95b5f4bbebc55cd9a8d6ce44')
diff --git a/testing/postgresql/PKGBUILD b/testing/postgresql/PKGBUILD
deleted file mode 100644
index 5863f2b73..000000000
--- a/testing/postgresql/PKGBUILD
+++ /dev/null
@@ -1,164 +0,0 @@
-# $Id: PKGBUILD 168645 2012-10-13 18:34:13Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgbase=postgresql
-pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.2.1
-_majorver=${pkgver%.*}
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.postgresql.org/"
-license=('custom:PostgreSQL')
-makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0')
-source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-        postgresql-run-socket.patch
-        postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate
-        postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
-md5sums=('c0b4799ea9850eae3ead14f0a60e9418'
-         '75c579eed03ffb2312631f0b649175b4'
-         '1ddd1df8010549f237e7983bb326025e'
-         'a54d09a20ab1672adf08f037df188d53'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'd28e443f9f65a5712c52018b84e27137'
-         '89b48774b0dae7c37fbb0e907c3c1db8'
-         'd34e4ab6d589aa819a1e2829290a3b7c'
-         '505e0e4abfc746cae9558584d471a03c')
-sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461'
-            '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
-            '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
-            '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
-            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
-            '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
-            'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68'
-            'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07'
-            '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669')
-
-build() {
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  patch -Np1 < ../postgresql-run-socket.patch
-
-  ./configure --prefix=/usr \
-  --mandir=/usr/share/man \
-  --datadir=/usr/share/postgresql \
-  --sysconfdir=/etc \
-  --with-krb5 \
-  --with-libxml \
-  --with-openssl \
-  --with-perl \
-  --with-python PYTHON=/usr/bin/python2 \
-  --with-tcl \
-  --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=('krb5' '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}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0')
-  optdepends=('python2: for PL/Python support'
-              'perl: for PL/Perl support'
-              'tcl: for PL/Tcl 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.rcd" "${pkgdir}/etc/rc.d/postgresql"
-  install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \
-    "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf"
-  install -D -m644 "${srcdir}/postgresql.service" \
-    "${pkgdir}/usr/lib/systemd/system/postgresql.service"
-  install -D -m755 "${srcdir}/postgresql-check-db-dir" \
-    "${pkgdir}/usr/bin/postgresql-check-db-dir"
-
-  # 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"
-}
diff --git a/testing/postgresql/postgresql-check-db-dir b/testing/postgresql/postgresql-check-db-dir
deleted file mode 100755
index 542c82209..000000000
--- a/testing/postgresql/postgresql-check-db-dir
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# This script verifies that the postgresql data directory has been correctly
-# initialized.  We do not want to automatically initdb it, because that has
-# a risk of catastrophic failure (ie, overwriting a valuable database) in
-# corner cases, such as a remotely mounted database on a volume that's a
-# bit slow to mount.  But we can at least emit a message advising newbies
-# what to do.
-
-PGDATA="$1"
-
-if [ -z "$PGDATA" ]
-then
-    echo "Usage: $0 database-path"
-    exit 1
-fi
-
-# PGMAJORVERSION is major version
-PGMAJORVERSION=9.2
-# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-PREVMAJORVERSION=9.1
-
-# Check for the PGDATA structure
-if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
-then
-    # Check version of existing PGDATA
-    if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ]
-    then
-        : A-OK
-    elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ]
-    then
-        echo $"An old version of the database format was found."
-        echo $"See https://wiki.archlinux.org/index.php/PostgreSQL#Upgrading_PostgreSQL"
-        exit 1
-    else
-        echo $"An old version of the database format was found."
-        echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION."
-        echo $"See http://www.postgresql.org/docs/9.2/static/upgrading.html"
-        exit 1
-    fi
-else
-    # No existing PGDATA! Warn the user to initdb it.
-    echo $"\"$PGDATA\" is missing or empty. Use a command like"
-    echo $"  su - postgres -c \"initdb --locale en_US.UTF-8 -D '$PGDATA'\""
-    echo $"with relevant options, to initialize the database cluster."
-    exit 1
-fi
-
-exit 0
diff --git a/testing/postgresql/postgresql-initdb b/testing/postgresql/postgresql-initdb
deleted file mode 100755
index a691a83ff..000000000
--- a/testing/postgresql/postgresql-initdb
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /etc/conf.d/postgresql
-
-# 2nd clause is necessary to prevent symlinking the directory to itself when it
-# doesn't exist yet
-if [ ! /var/lib/postgres -ef "$PGROOT" ] && [ /var/lib/postgres != "$PGROOT" ]; then
-    echo "Creating symlink /var/lib/postgres -> $PGROOT"
-
-    # Remove /var/lib/postgres if empty dir, but not if symlink
-    if [ ! -L /var/lib/postgres ] && [ -d /var/lib/postgres ]; then
-        rmdir /var/lib/postgres
-    fi
-
-    ln -sf "$PGROOT" /var/lib/postgres
-fi
-
-PGDATA="$PGROOT/data"
-
-if [ ! -d "$PGDATA" ]; then
-    echo "Initializing database in $PGDATA"
-
-    mkdir -p "$PGDATA"
-    chown -R postgres:postgres "$PGDATA"
-
-    su - postgres -m -c "/usr/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null
-
-    if [ -f /etc/postgresql/postgresql.conf ]; then
-        ln -sf /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
-    fi
-fi
diff --git a/testing/postgresql/postgresql-run-socket.patch b/testing/postgresql/postgresql-run-socket.patch
deleted file mode 100644
index b558c7b74..000000000
--- a/testing/postgresql/postgresql-run-socket.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
---- postgresql-9.2.0.sockets/src/include/pg_config_manual.h	2012-09-06 17:26:17.000000000 -0400
-+++ postgresql-9.2.0/src/include/pg_config_manual.h	2012-09-06 18:13:18.183092471 -0400
-@@ -144,7 +144,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
diff --git a/testing/postgresql/postgresql.confd b/testing/postgresql/postgresql.confd
deleted file mode 100644
index 6001c16d1..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 en_US.UTF-8"
-## 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 263bccb25..000000000
--- a/testing/postgresql/postgresql.install
+++ /dev/null
@@ -1,34 +0,0 @@
-post_install() {
-  if [ ! -d '/var/lib/postgres' ]; then
-    mkdir -p '/var/lib/postgres'
-  fi
-  if ! getent group postgres >/dev/null; then
-    groupadd -g 88 postgres
-  fi
-  if ! getent passwd postgres >/dev/null; then
-    useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres
-    passwd -l postgres >/dev/null
-  fi
-}
-
-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
-  if [ $(vercmp $2 '9.2.1-2') -lt 0 ]; then
-    echo "Note: The Unix domain socket location has changed; be sure to"
-    echo "      restart any local applications using libpq.so."
-  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/postgresql/postgresql.rcd b/testing/postgresql/postgresql.rcd
deleted file mode 100755
index f3600b30b..000000000
--- a/testing/postgresql/postgresql.rcd
+++ /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.service b/testing/postgresql/postgresql.service
deleted file mode 100644
index 294b66e8f..000000000
--- a/testing/postgresql/postgresql.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=PostgreSQL database server
-After=network.target
-
-[Service]
-Type=forking
-TimeoutSec=120
-User=postgres
-Group=postgres
-
-Environment=PGROOT=/var/lib/postgres
-
-SyslogIdentifier=postgres
-PIDFile=/var/lib/postgres/data/postmaster.pid
-
-ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGROOT}/data
-ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120
-ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload
-ExecStop=  /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast
-
-# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in
-# killing Postgres, so adjust it downward
-OOMScoreAdjust=-200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/postgresql/postgresql.tmpfiles.conf b/testing/postgresql/postgresql.tmpfiles.conf
deleted file mode 100644
index 6c48e34ed..000000000
--- a/testing/postgresql/postgresql.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/postgresql 0755 postgres postgres -
diff --git a/testing/ppl/PKGBUILD b/testing/ppl/PKGBUILD
deleted file mode 100644
index f7ad1798b..000000000
--- a/testing/ppl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 162818 2012-07-01 07:04:36Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: ezzetabi <ezzetabi at gawab dot com>
-
-pkgname=ppl
-pkgver=1.0
-pkgrel=1
-pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
-arch=('i686' 'x86_64')
-url="http://bugseng.com/products/ppl"
-license=('GPL3')
-depends=('gmp>=5.0')
-options=('!docs' '!libtool')
-source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
-md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c'
-         '5f490df826c76fed296060ca8fca4eb5')
-
-build() {
-  cd $srcdir/ppl-$pkgver
-  ./configure --prefix=/usr --enable-interfaces="c,cxx"
-  make
-}
-
-check() {
-  cd $srcdir/ppl-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/ppl-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/testing/ppp/PKGBUILD b/testing/ppp/PKGBUILD
deleted file mode 100644
index 9d3bacfb0..000000000
--- a/testing/ppp/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 168656 2012-10-13 20:46:01Z thomas $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-pkgname=ppp
-pkgver=2.4.5
-pkgrel=5
-pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
-arch=(i686 x86_64) 
-url="http://www.samba.org/ppp/"
-license=('custom:GPL/BSD')
-groups=('base')
-depends=('glibc' 'libpcap>=1.0.0')
-backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down})
-source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz
-        options
-        pon
-        poff
-        ppp
-        plog
-        pon.1
-        ip-up
-        ip-down
-        ip-up.d.dns.sh
-        ip-down.d.dns.sh
-        ipv6-up
-        ipv6-down
-        ipv6-up.d.iface-config.sh
-        ppp.systemd)
-md5sums=('4621bc56167b6953ec4071043fe0ec57'
-         '7a9259a8f038073eeea7e4552ff1849f'
-         '48c024f73a80c8b69c4def22f86902cc'
-         '2d811f8470ccdea3b8c4505a438483e9'
-         '7561c73b557292d5ba1a9c5dbd270fde'
-         '86cdaf133f7a79fb464f02d83afc7734'
-         '44cc662ba9aa61dd9add3ddd4c5ded57'
-         'e4beb16ed600b61336d50b2bd2df7cd5'
-         '529b924f644f80cf30d72a966abc7419'
-         '4a074d74c29625b254a1db720cb87b99'
-         '8d1be5af8e46393ba6eb273377831e38'
-         '4cbd0a9af01c27067450ec7d3f5fa673'
-         'b75c2fbc4afa9f2d8108b680c88c7036'
-         '9dde53aa5a931ebe1c7e3469199777c5'
-         'fafead5c9d66d0574e6f0a2e5f4d4631')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix CFLAGS
-  # -D_GNU_SOURCE is needed for IPv6 to work apparently
-  export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-  sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux
-  sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux
-  sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux
-  sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux
-  sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux
-
-  # enable active filter
-  sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux
-  # enable ipv6 support
-  sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
-  # Enable Microsoft proprietary Callback Control Protocol
-  sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux 
-  
-  # Fix build error with recent kernels
-  rm include/linux/if_pppol2tp.h 
-
-  ./configure --prefix=/usr
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/usr" install 
-  install -D -m644 ../options "${pkgdir}/etc/ppp/options"
-  install -D -m755 ../ip-up   "${pkgdir}/etc/ppp/ip-up"
-  install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down"
-  install -d -m755 "${pkgdir}/etc/ppp/ip-up.d"
-  install -d -m755 "${pkgdir}/etc/ppp/ip-down.d"
-  install -m755 ../ip-up.d.dns.sh   "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh"
-  install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh"
-  install -D -m755 ../ipv6-up   "${pkgdir}/etc/ppp/ipv6-up"
-  install -D -m755 ../ipv6-down "${pkgdir}/etc/ppp/ipv6-down"
-  install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d"
-  install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d"
-  install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh"
-  install -D -m755 ../pon  "${pkgdir}/usr/bin/pon"
-  install -D -m755 ../poff "${pkgdir}/usr/bin/poff"
-  install -D -m755 ../plog "${pkgdir}/usr/sbin/plog"
-  install -D -m600 etc.ppp/pap-secrets  "${pkgdir}/etc/ppp/pap-secrets"
-  install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets"
-  install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp"
-  install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1"
-  install -d -m755 "${pkgdir}/etc/ppp/peers" 
-  chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so
-  install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service
-}
diff --git a/testing/ppp/ip-down b/testing/ppp/ip-down
deleted file mode 100644
index cfd3ae093..000000000
--- a/testing/ppp/ip-down
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script is run by pppd after the connection has ended.
-#
-
-# Execute all scripts in /etc/ppp/ip-down.d/
-for ipdown in /etc/ppp/ip-down.d/*.sh; do
-  if [ -x $ipdown ]; then
-    # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam
-    $ipdown "$@"
-  fi
-done
diff --git a/testing/ppp/ip-down.d.dns.sh b/testing/ppp/ip-down.d.dns.sh
deleted file mode 100644
index 9e19f7d1b..000000000
--- a/testing/ppp/ip-down.d.dns.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf
diff --git a/testing/ppp/ip-up b/testing/ppp/ip-up
deleted file mode 100644
index 20473d73a..000000000
--- a/testing/ppp/ip-up
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script is run by pppd when there's a successful ppp connection.
-#
-
-# Execute all scripts in /etc/ppp/ip-up.d/
-for ipup in /etc/ppp/ip-up.d/*.sh; do
-  if [ -x $ipup ]; then
-    # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam
-    $ipup "$@"
-  fi
-done
diff --git a/testing/ppp/ip-up.d.dns.sh b/testing/ppp/ip-up.d.dns.sh
deleted file mode 100644
index f9df543a4..000000000
--- a/testing/ppp/ip-up.d.dns.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then
-  [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME}
-  mv /etc/ppp/resolv.conf /etc/resolv.conf
-  chmod 644 /etc/resolv.conf
-fi
diff --git a/testing/ppp/ipv6-down b/testing/ppp/ipv6-down
deleted file mode 100644
index d3b9e28b3..000000000
--- a/testing/ppp/ipv6-down
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script is run by pppd after the connection has ended.
-#
-
-# Execute all scripts in /etc/ppp/ipv6-down.d/
-for ipdown in /etc/ppp/ipv6-down.d/*.sh; do
-  if [ -x $ipdown ]; then
-    # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam
-    $ipdown "$@"
-  fi
-done
diff --git a/testing/ppp/ipv6-up b/testing/ppp/ipv6-up
deleted file mode 100644
index b294aafdc..000000000
--- a/testing/ppp/ipv6-up
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script is run by pppd when there's a successful ppp connection.
-#
-
-# Execute all scripts in /etc/ppp/ipv6-up.d/
-for ipup in /etc/ppp/ipv6-up.d/*.sh; do
-  if [ -x $ipup ]; then
-    # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam
-    $ipup "$@"
-  fi
-done
diff --git a/testing/ppp/ipv6-up.d.iface-config.sh b/testing/ppp/ipv6-up.d.iface-config.sh
deleted file mode 100644
index b23d6f61d..000000000
--- a/testing/ppp/ipv6-up.d.iface-config.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo 0 > /proc/sys/net/ipv6/conf/$1/use_tempaddr
-echo 2 > /proc/sys/net/ipv6/conf/$1/accept_ra
diff --git a/testing/ppp/options b/testing/ppp/options
deleted file mode 100644
index 63691842c..000000000
--- a/testing/ppp/options
+++ /dev/null
@@ -1,352 +0,0 @@
-# /etc/ppp/options
-# 
-# Originally created by Jim Knoble <jmknoble@mercury.interpath.net>
-# Modified for Debian by alvar Bray <alvar@meiko.co.uk>
-# Modified for PPP Server setup by Christoph Lameter <clameter@debian.org>
-# Modified for ArchLinux by Manolis Tzanidakis <manolis@archlinux.org>
-#
-# To quickly see what options are active in this file, use this command:
-#   egrep -v '#|^ *$' /etc/ppp/options
-
-# Specify which DNS Servers the incoming Win95 or WinNT Connection should use
-# Two Servers can be remotely configured
-# ms-dns 192.168.1.1
-# ms-dns 192.168.1.2
-
-# Specify which WINS Servers the incoming connection Win95 or WinNT should use
-# ms-wins 192.168.1.50
-# ms-wins 192.168.1.51
-
-# Run the executable or shell command specified after pppd has
-# terminated the link.  This script could, for example, issue commands
-# to the modem to cause it to hang up if hardware modem control signals
-# were not available.
-#disconnect "chat -- \d+++\d\c OK ath0 OK"
-
-# async character map -- 32-bit hex; each bit is a character
-# that needs to be escaped for pppd to receive it.  0x00000001
-# represents '\x01', and 0x80000000 represents '\x1f'.
-asyncmap 0
-
-# Require the peer to authenticate itself before allowing network
-# packets to be sent or received.
-# Please do not disable this setting. It is expected to be standard in
-# future releases of pppd. Use the call option (see manpage) to disable
-# authentication for specific peers.
-auth
-
-# Use hardware flow control (i.e. RTS/CTS) to control the flow of data
-# on the serial port.
-crtscts
-
-# Use software flow control (i.e. XON/XOFF) to control the flow of data
-# on the serial port.
-#xonxoff
-
-# Specifies that certain characters should be escaped on transmission
-# (regardless of whether the peer requests them to be escaped with its
-# async control character map).  The characters to be escaped are
-# specified as a list of hex numbers separated by commas.  Note that
-# almost any character can be specified for the escape option, unlike
-# the asyncmap option which only allows control characters to be
-# specified.  The characters which may not be escaped are those with hex
-# values 0x20 - 0x3f or 0x5e.
-#escape 11,13,ff
-
-# Don't use the modem control lines.
-#local
-
-# Specifies that pppd should use a UUCP-style lock on the serial device
-# to ensure exclusive access to the device.
-lock
-
-# Don't show the passwords when logging the contents of PAP packets.
-# This is the default.
-hide-password
-
-# When logging the contents of PAP packets, this option causes pppd to
-# show the password string in the log message.
-#show-password
-
-# Use the modem control lines.  On Ultrix, this option implies hardware
-# flow control, as for the crtscts option.  (This option is not fully
-# implemented.)
-modem
-
-# Set the MRU [Maximum Receive Unit] value to <n> for negotiation.  pppd
-# will ask the peer to send packets of no more than <n> bytes. The
-# minimum MRU value is 128.  The default MRU value is 1500.  A value of
-# 296 is recommended for slow links (40 bytes for TCP/IP header + 256
-# bytes of data).
-#mru 542
-
-# Set the interface netmask to <n>, a 32 bit netmask in "decimal dot"
-# notation (e.g. 255.255.255.0).
-#netmask 255.255.255.0
-
-# Disables the default behaviour when no local IP address is specified,
-# which is to determine (if possible) the local IP address from the
-# hostname. With this option, the peer will have to supply the local IP
-# address during IPCP negotiation (unless it specified explicitly on the
-# command line or in an options file).
-#noipdefault
-
-# Enables the "passive" option in the LCP.  With this option, pppd will
-# attempt to initiate a connection; if no reply is received from the
-# peer, pppd will then just wait passively for a valid LCP packet from
-# the peer (instead of exiting, as it does without this option).
-#passive
-
-# With this option, pppd will not transmit LCP packets to initiate a
-# connection until a valid LCP packet is received from the peer (as for
-# the "passive" option with old versions of pppd).
-#silent
-
-# Don't request or allow negotiation of any options for LCP and IPCP
-# (use default values).
-#-all
-
-# Disable Address/Control compression negotiation (use default, i.e.
-# address/control field disabled).
-#-ac
-
-# Disable asyncmap negotiation (use the default asyncmap, i.e. escape
-# all control characters).
-#-am
-
-# Don't fork to become a background process (otherwise pppd will do so
-# if a serial device is specified).
-#-detach
-
-# Disable IP address negotiation (with this option, the remote IP
-# address must be specified with an option on the command line or in
-# an options file).
-#-ip
-
-# Disable IPCP negotiation and IP communication. This option should
-# only be required if the peer is buggy and gets confused by requests
-# from pppd for IPCP negotiation.
-#noip
-
-# Disable magic number negotiation.  With this option, pppd cannot
-# detect a looped-back line.
-#-mn
-
-# Disable MRU [Maximum Receive Unit] negotiation (use default, i.e.
-# 1500).
-#-mru
-
-# Disable protocol field compression negotiation (use default, i.e.
-# protocol field compression disabled).
-#-pc
-
-# Require the peer to authenticate itself using PAP.
-#+pap
-
-# Don't agree to authenticate using PAP.
-#-pap
-
-# Require the peer to authenticate itself using CHAP [Cryptographic
-# Handshake Authentication Protocol] authentication.
-#+chap
-
-# Don't agree to authenticate using CHAP.
-#-chap
-
-# Disable negotiation of Van Jacobson style IP header compression (use
-# default, i.e. no compression).
-#-vj
-
-# Increase debugging level (same as -d).  If this option is given, pppd
-# will log the contents of all control packets sent or received in a
-# readable form.  The packets are logged through syslog with facility
-# daemon and level debug. This information can be directed to a file by
-# setting up /etc/syslog.conf appropriately (see syslog.conf(5)).  (If
-# pppd is compiled with extra debugging enabled, it will log messages
-# using facility local2 instead of daemon).
-#debug
-
-# Append the domain name <d> to the local host name for authentication
-# purposes.  For example, if gethostname() returns the name porsche,
-# but the fully qualified domain name is porsche.Quotron.COM, you would
-# use the domain option to set the domain name to Quotron.COM.
-#domain <d>
-
-# Enable debugging code in the kernel-level PPP driver.  The argument n
-# is a number which is the sum of the following values: 1 to enable
-# general debug messages, 2 to request that the contents of received
-# packets be printed, and 4 to request that the contents of transmitted
-# packets be printed.
-#kdebug n
-
-# Set the MTU [Maximum Transmit Unit] value to <n>. Unless the peer
-# requests a smaller value via MRU negotiation, pppd will request that
-# the kernel networking code send data packets of no more than n bytes
-# through the PPP network interface.
-#mtu <n>
-
-# Set the name of the local system for authentication purposes to <n>.
-# This is a privileged option. With this option, pppd will use lines in the
-# secrets files which have <n> as the second field when looking for a
-# secret to use in authenticating the peer. In addition, unless overridden
-# with the user option, <n> will be used as the name to send to the peer
-# when authenticating the local system to the peer. (Note that pppd does
-# not append the domain name to <n>.)
-#name <n>
-
-# Enforce the use of the hostname as the name of the local system for
-# authentication purposes (overrides the name option).
-#usehostname
-
-# Set the assumed name of the remote system for authentication purposes
-# to <n>.
-#remotename <n>
-
-# Add an entry to this system's ARP [Address Resolution Protocol]
-# table with the IP address of the peer and the Ethernet address of this
-# system.
-proxyarp
-
-# Use the system password database for authenticating the peer using
-# PAP. Note: mgetty already provides this option. If this is specified
-# then dialin from users using a script under Linux to fire up ppp wont work.
-# login
-
-# If this option is given, pppd will send an LCP echo-request frame to the
-# peer every n seconds. Normally the peer should respond to the echo-request
-# by sending an echo-reply. This option can be used with the
-# lcp-echo-failure option to detect that the peer is no longer connected.
-lcp-echo-interval 30
-
-# If this option is given, pppd will presume the peer to be dead if n
-# LCP echo-requests are sent without receiving a valid LCP echo-reply.
-# If this happens, pppd will terminate the connection.  Use of this
-# option requires a non-zero value for the lcp-echo-interval parameter.
-# This option can be used to enable pppd to terminate after the physical
-# connection has been broken (e.g., the modem has hung up) in
-# situations where no hardware modem control lines are available.
-lcp-echo-failure 4
-
-# Set the LCP restart interval (retransmission timeout) to <n> seconds
-# (default 3).
-#lcp-restart <n>
-
-# Set the maximum number of LCP terminate-request transmissions to <n>
-# (default 3).
-#lcp-max-terminate <n>
-
-# Set the maximum number of LCP configure-request transmissions to <n>
-# (default 10).
-#lcp-max-configure <n>
-
-# Set the maximum number of LCP configure-NAKs returned before starting
-# to send configure-Rejects instead to <n> (default 10).
-#lcp-max-failure <n>
-
-# Set the IPCP restart interval (retransmission timeout) to <n>
-# seconds (default 3).
-#ipcp-restart <n>
-
-# Set the maximum number of IPCP terminate-request transmissions to <n>
-# (default 3).
-#ipcp-max-terminate <n>
-
-# Set the maximum number of IPCP configure-request transmissions to <n>
-# (default 10).
-#ipcp-max-configure <n>
-
-# Set the maximum number of IPCP configure-NAKs returned before starting
-# to send configure-Rejects instead to <n> (default 10).
-#ipcp-max-failure <n>
-
-# Set the PAP restart interval (retransmission timeout) to <n> seconds
-# (default 3).
-#pap-restart <n>
-
-# Set the maximum number of PAP authenticate-request transmissions to
-# <n> (default 10).
-#pap-max-authreq <n>
-
-# Set the maximum time that pppd will wait for the peer to authenticate
-# itself with PAP to <n> seconds (0 means no limit).
-#pap-timeout <n>
-
-# Set the CHAP restart interval (retransmission timeout for
-# challenges) to <n> seconds (default 3).
-#chap-restart <n>
-
-# Set the maximum number of CHAP challenge transmissions to <n>
-# (default 10).
-#chap-max-challenge
-
-# If this option is given, pppd will rechallenge the peer every <n>
-# seconds.
-#chap-interval <n>
-
-# With this option, pppd will accept the peer's idea of our local IP
-# address, even if the local IP address was specified in an option.
-#ipcp-accept-local
-
-# With this option, pppd will accept the peer's idea of its (remote) IP
-# address, even if the remote IP address was specified in an option.
-#ipcp-accept-remote
-
-# Disable the IPXCP and IPX protocols.
-# To let pppd pass IPX packets comment this out --- you'll probably also
-# want to install ipxripd, and have the Internal IPX Network option enabled
-# in your kernel.  /usr/doc/HOWTO/IPX-HOWTO.gz contains more info.
-noipx
-
-# Exit once a connection has been made and terminated. This is the default,
-# unless the `persist' or `demand' option has been specified.
-#nopersist
-
-# Do not exit after a connection is terminated; instead try to reopen
-# the connection.
-#persist
-
-# Terminate after n consecutive failed connection attempts.
-# A value of 0 means no limit. The default value is 10.
-#maxfail <n>
-
-# Initiate the link only on demand, i.e. when data traffic is present. 
-# With this option, the remote IP address must be specified by the user on
-# the command line or in an options file.  Pppd will initially configure
-# the interface and enable it for IP traffic without connecting to the peer. 
-# When traffic is available, pppd will connect to the peer and perform
-# negotiation, authentication, etc.  When this is completed, pppd will
-# commence passing data packets (i.e., IP packets) across the link.
-#demand
-
-# Specifies that pppd should disconnect if the link is idle for <n> seconds.
-# The link is idle when no data packets (i.e. IP packets) are being sent or
-# received.  Note: it is not advisable to use this option with the persist
-# option without the demand option.  If the active-filter option is given,
-# data packets which are rejected by the specified activity filter also
-# count as the link being idle.
-#idle <n>
-
-# Specifies how many seconds to wait before re-initiating the link after
-# it terminates.  This option only has any effect if the persist or demand
-# option is used.  The holdoff period is not applied if the link was
-# terminated because it was idle.
-#holdoff <n>
-
-# Wait for up n milliseconds after the connect script finishes for a valid
-# PPP packet from the peer.  At the end of this time, or when a valid PPP
-# packet is received from the peer, pppd will commence negotiation by
-# sending its first LCP packet.  The default value is 1000 (1 second).
-# This wait period only applies if the connect or pty option is used.
-#connect-delay <n>
-
-# Packet filtering: for more information, see pppd(8)
-# Any packets matching the filter expression will be interpreted as link
-# activity, and will cause a "demand" connection to be activated, and reset
-# the idle connection timer. (idle option)
-# The filter expression is akin to that of tcpdump(1)
-#active-filter <filter-expression>
-
-# uncomment the line below this if you use PPPoE
-#plugin /usr/lib/pppd/plugins/pppoe.so
-
-# ---<End of File>---
diff --git a/testing/ppp/plog b/testing/ppp/plog
deleted file mode 100644
index 84d2c7340..000000000
--- a/testing/ppp/plog
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -s /var/log/ppp.log ]; then
-  exec tail "$@" /var/log/ppp.log
-else
-  exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\['
-fi
diff --git a/testing/ppp/poff b/testing/ppp/poff
deleted file mode 100644
index 8b4dffc59..000000000
--- a/testing/ppp/poff
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Written by John Hasler <john@dhh.gt.org> and based on work 
-# by Phil Hands <phil@hands.com>.  Distributed under the GNU GPL
-
-if [ -x /usr/bin/kill ]; then
-  KILL="/usr/bin/kill"
-else
-  KILL="/bin/kill"
-fi
-SIG=TERM
-DONE="stopped"
-MODE=""
-
-usage ()
-{
-   cat <<!EOF!
-usage: $0 [option] [provider]
-options:
-  -r        Cause pppd to drop the line and redial.
-  -d        Toggle the state of pppd's debug option.
-  -c        Cause pppd to renegotiate compression.
-  -a        Stop all pppd's.  'provider' will be ignored.
-  -h        Print this help summary and exit.
-  -v        Print version and exit.
-  none      Stop pppd.
-
-Options may not be combined.
-
-If 'provider' is omitted pppd will be stopped or signalled if and only if
-there is exactly one running unless the '-a' option was given.  If
-'provider' is supplied the pppd controlling the connection to that
-provider will be stopped or signalled.
-!EOF!
-}
-
-# Get option.  If there are none replace the "?" that getopts puts in
-# FLAG on error with "null".
-getopts rdcavh FLAG
-if [ "$?" -ne 0 ]; then
-    FLAG="null"
-fi
-
-# Check for additional options.  Should be none.
-getopts :rdcavh DUMMY
-if [ "$?" -eq 0 ]; then
-    echo "$0: Illegal option -- ${OPTARG}."
-    exit 1
-fi
-
-case $FLAG in
- "r") SIG=HUP;  DONE=signalled; shift ;;
- "d") SIG=USR1; DONE=signalled; shift ;;
- "c") SIG=USR2; DONE=signalled; shift ;;
- "a") MODE="all"; shift ;;
- "v") echo "$0$Revision: 1.1 $_TrickToPrint_RCS_Revision"; exit 0 ;;
- "h") usage; exit 0 ;;
- "?") exit 1;
-esac
-
-# Get the PIDs of all the pppds running.  Could also get these from
-# /var/run, but pppd doesn't create .pid files until ppp is up.
-PIDS=`pidof pppd`
-
-# poff is pointless if pppd isn't running.
-if test -z "$PIDS"; then
-    echo "$0: No pppd is running.  None ${DONE}."
-    exit 1
-fi
-
-# Find out how many pppd's are running.
-N=`echo "$PIDS" | wc -w`
-
-# If there are no arguments we can't do anything if there is more than one
-# pppd running.
-if test "$#" -eq 0 -a "$N" -gt 1 -a $FLAG != "a" ; then
-    echo "$0: More than one pppd running and no "-a" option and 
-no arguments supplied. Nothing ${DONE}."
-    exit 1
-fi
-
-# If either there are no arguments or '-a' was specified kill all the
-# pppd's.
-if test "$#" -eq 0 -o "$MODE" = "all" ; then
-    $KILL -$SIG $PIDS || {
-        echo "$0: $KILL failed.  None ${DONE}."
-        exit 1
-    }
-    exit 0
-fi
-
-# There is an argument, so kill the pppd started on that provider.
-PID=`ps axw | grep "[ /]pppd call $1 *\$" | awk '{print $1}'`
-if test -n "$PID" ; then
-    $KILL -$SIG $PID || {
-        echo "$0: $KILL failed.  None ${DONE}."
-        exit 1
-    }
-else
-   echo "$0: I could not find a pppd process for provider '$1'. None ${DONE}."
-   exit 1
-fi
-exit 0
diff --git a/testing/ppp/pon b/testing/ppp/pon
deleted file mode 100644
index 36885050b..000000000
--- a/testing/ppp/pon
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-  -*) echo "
-Usage: pon [provider] [arguments]
-
-If you specify one argument, a PPP connection will be started using
-settings from the appropriate file in the /etc/ppp/peers/ directory, and
-any additional arguments supplied will be passed as extra arguments to
-pppd.
-"
-      exit 0
-      ;;
-esac
-
-if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then
-  echo "
-Please configure /etc/ppp/peers/provider or use a command line argument to
-use another file in /etc/ppp/peers/ directory.
-"
-  exit 1
-fi
-
-if [ "$1" -a ! -f "/etc/ppp/peers/$1" ]; then
-  echo "
-The file /etc/ppp/peers/$1 does not exist.
-"
-  exit 1
-fi
-
-exec /usr/sbin/pppd call ${@:-provider}
-
diff --git a/testing/ppp/pon.1 b/testing/ppp/pon.1
deleted file mode 100644
index bb3220564..000000000
--- a/testing/ppp/pon.1
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" This manual is published under the GPL.
-.\" All guidelines specified in the GPL apply here.
-.\" To get an ascii file:
-.\" groff -man -Tascii pon.1 > pon.txt
-.\"
-.TH PON 1 "July 2000" "Debian Project" "Debian PPPD"
-.SH NAME
-pon, poff, plog \- starts up, shuts down or lists the log of PPP connections
-.SH SYNOPSIS
-.B pon
-[ isp-name [ options ] ]
-.br
-.B poff
-[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ]
-.br
-.B plog
-[ arguments ]
-.SH DESCRIPTION
-This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP
-scripts, which allow users to control PPP connections.
-..
-.SS pon
-\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP
-file, if it exists and is executable. Otherwise, a PPP connection will be
-started using configuration from \fI/etc/ppp/peers/provider\fP.
-This is the default behaviour unless an \fBisp-name\fP argument is given.
-.PP
-For instance, to use ISP configuration "myisp" run:
-.IP
-pon myisp
-.PP
-\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP.
-You can pass additional \fBoptions\fP after the ISP name, too.
-\fBpon\fP can be used to run multiple, simultaneous PPP connections.
-..
-.SS poff
-\fBpoff\fP closes a PPP connection. If more than one PPP connection exists,
-the one named in the argument to \fBpoff\fP will be killed, e.g.
-.IP
-poff myprovider2
-.PP
-will terminate the connection to myprovider2, and leave the PPP connections
-to e.g. "myprovider1" or "myprovider3" up and running.
-.PP
-\fBpoff\fP takes the following command line options:
-.RS
-.TP
-.B "\-r"
-causes the connection to be redialed after it is dropped.
-.TP
-.B "\-d"
-toggles the state of pppd's debug option.
-.TP
-.B "\-c"
-causes
-.BR pppd (8)
-to renegotiate compression.
-.TP
-.B "\-a"
-stops all running ppp connections. If the argument \fBisp-name\fP
-is given it will be ignored.
-.TP
-.B "\-h"
-displays help information.
-.TP
-.B "\-v"
-prints the version and exits.
-.PP
-If no argument is given, \fBpoff\fP will stop or signal pppd if and only
-if there is exactly one running. If more than one connection is active,
-it will exit with an error code of 1.
-..
-.SS plog
-\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that
-file doesn't exist, it shows you the last few lines of your
-\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd.
-This script makes use of the
-.BR tail (1)
-command, so arguments that can be passed to
-.BR tail (1)
-can also be passed to \fBplog\fP.
-.PP
-Note: the \fBplog\fP script can only be used by root or another system
-administrator in group "adm", due to security reasons. Also, to have all
-pppd-generated information in one logfile, that plog can show, you need the
-following line in your \fI/etc/syslog.conf\fP file:
-.PP
-local2.*                -/var/log/ppp.log
-.RE
-.SH FILES
-.TP
-.I /etc/ppp/options
-PPPd system options file.
-.TP
-.I /etc/ppp/pap-secrets
-System PAP passwords file.
-.TP
-.I /etc/ppp/chap-secrets
-System CHAP passwords file.
-.TP
-.I /etc/ppp/peers/
-Directory holding the peer options files. The default file is called
-\fIprovider\fP.
-.TP
-.I /etc/chatscripts/provider
-The chat script invoked from the default \fI/etc/ppp/peers/provider\fP.
-.TP
-.I /var/log/ppp.log
-The default PPP log file.
-.SH AUTHORS
-The p-commands were written by Christoph Lameter <clameter@debian.org>.
-Updated and revised by Philip Hands <phil@hands.com>.
-.br
-This manual was written by Othmar Pasteka <othmar@tron.at>. Modified
-by Rob Levin <lilo@openprojects.net>, with some extensions taken from
-the old p-commands manual written by John Hasler <jhasler@debian.org>.
-.SH "SEE ALSO"
-.BR pppd (8),
-.BR chat (8),
-.BR tail (1).
-
diff --git a/testing/ppp/ppp b/testing/ppp/ppp
deleted file mode 100644
index 16e01bad7..000000000
--- a/testing/ppp/ppp
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/pppd`
-case "$1" in
-  start)
-    stat_busy "Starting PPP daemon"
-    [ -z "$PID" ] && /usr/bin/pon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ppp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PPP daemon"
-    [ ! -z "$PID" ]  && poff -a &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ppp
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/ppp/ppp.systemd b/testing/ppp/ppp.systemd
deleted file mode 100644
index a5c490a73..000000000
--- a/testing/ppp/ppp.systemd
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=PPP link to %I
-Before=network.target
-
-[Service]
-ExecStart=/usr/sbin/pppd call %I nodetach
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/procps-ng/PKGBUILD b/testing/procps-ng/PKGBUILD
deleted file mode 100644
index cab5fac96..000000000
--- a/testing/procps-ng/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 166733 2012-09-17 08:10:26Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Eric Bélanger <eric@archlinux.org>
-
-pkgname=procps-ng
-pkgver=3.3.3
-pkgrel=6
-pkgdesc='Utilities for monitoring your system and its processes'
-arch=('i686' 'x86_64')
-url="http://gitorious.org/procps"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('ncurses')
-conflicts=('procps')
-provides=('procps')
-replaces=('procps')
-backup=('etc/sysctl.conf')
-options=('!libtool')
-source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}
-        sysctl.conf)
-sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0'
-          '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53')
-
-build() {
-  cd "${srcdir}/procps-procps"
-  echo ${pkgver} > .tarball-version
-  ./autogen.sh
-  ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
-  make
-}
-
-package() {
-  cd "${srcdir}/procps-procps"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
-
-  # provided by util-linux
-  rm "${pkgdir}/bin/kill"
-  rm "${pkgdir}/usr/share/man/man1/kill.1"
-}
diff --git a/testing/procps-ng/sysctl.conf b/testing/procps-ng/sysctl.conf
deleted file mode 100644
index 4695cdd92..000000000
--- a/testing/procps-ng/sysctl.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Configuration file for runtime kernel parameters.
-# See sysctl.conf(5) for more information.
-
-# Have the CD-ROM close when you use it, and open when you are done.
-#dev.cdrom.autoclose = 1
-#dev.cdrom.autoeject = 1
-
-# Protection from the SYN flood attack.
-net.ipv4.tcp_syncookies = 1
-
-# See evil packets in your logs.
-#net.ipv4.conf.all.log_martians = 1
-
-# Never accept redirects or source routes (these are only useful for routers).
-#net.ipv4.conf.all.accept_redirects = 0
-#net.ipv4.conf.all.accept_source_route = 0
-#net.ipv6.conf.all.accept_redirects = 0
-#net.ipv6.conf.all.accept_source_route = 0
-
-# Disable packet forwarding.
-net.ipv4.ip_forward = 0
-net.ipv6.conf.all.forwarding = 0
-
-# Tweak the port range used for outgoing connections.
-#net.ipv4.ip_local_port_range = 32768 61000
-
-# Tweak those values to alter disk syncing and swap behavior.
-#vm.vfs_cache_pressure = 100
-#vm.laptop_mode = 0
-#vm.swappiness = 60
-
-# Tweak how the flow of kernel messages is throttled.
-#kernel.printk_ratelimit_burst = 10
-#kernel.printk_ratelimit = 5
-
-# Reboot 600 seconds after kernel panic or oops.
-#kernel.panic_on_oops = 1
-#kernel.panic = 600
-
-# Disable SysRq key to avoid console security issues.
-kernel.sysrq = 0
diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD
deleted file mode 100644
index 4bfa43e3d..000000000
--- a/testing/proftpd/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 165249 2012-08-14 16:09:40Z andrea $
-# Maintainer:
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=proftpd
-pkgver=1.3.4b
-pkgrel=2
-epoch=1
-pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64')
-url="http://www.proftpd.org"
-license=('GPL')
-depends=('libmysqlclient' 'postgresql-libs')
-backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service')
-md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
-         'e5b9bd78029a15f82994efcb7ed2e9fb'
-         'c439a0a1dbc21b604d8382da87aa021b'
-         'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736'
-         '2c446f531948c8cc0a1e0fae28f8dfda')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --disable-pam \
-    --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
-    --sysconfdir=/etc \
-    --localstatedir=/run/proftpd \
-    --enable-ctrls \
-    --enable-ipv6 \
-    --with-includes=/usr/include/mysql:/usr/include/postgresql \
-    --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
-    --enable-nls \
-    --with-systemd
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
-
-  install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
-  install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
-  install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
-  install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-
-  install -d "${pkgdir}/usr/lib/systemd/system/"
-  install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
-}
diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd
deleted file mode 100755
index 9ea1d47fc..000000000
--- a/testing/proftpd/proftpd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-PROFTPD_ARGS=
-[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ProFTPd Server"
-    /usr/sbin/proftpd ${PROFTPD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon proftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ProFTPd Server"
-    [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /run/proftpd/proftpd.pid
-      rm_daemon proftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d
deleted file mode 100644
index 1a5a8a201..000000000
--- a/testing/proftpd/proftpd.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to proftpd
-#
-PROFTPD_ARGS=""
diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate
deleted file mode 100644
index 7b6d7a87b..000000000
--- a/testing/proftpd/proftpd.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/xferlog {
-   postrotate
-      /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/testing/proftpd/proftpd.service b/testing/proftpd/proftpd.service
deleted file mode 100644
index c202a2fdf..000000000
--- a/testing/proftpd/proftpd.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description = ProFTPD FTP Server
-After = network.target nss-lookup.target local-fs.target remote-fs.target
-
-[Service]
-Type = forking
-PIDFile = /run/proftpd/proftpd.pid
-Environment = PROFTPD_ARGS=
-EnvironmentFile = -/etc/conf.d/proftpd
-ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS
-ExecReload = /bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy = multi-user.target
diff --git a/testing/psiconv/PKGBUILD b/testing/psiconv/PKGBUILD
deleted file mode 100644
index 1dc2e588d..000000000
--- a/testing/psiconv/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169647 2012-10-25 01:35:36Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=psiconv
-pkgver=0.9.8
-pkgrel=10
-pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
-arch=('i686' 'x86_64')
-url="http://software.frodo.looijaard.name/psiconv/"
-license=('GPL')
-depends=('imagemagick')
-makedepends=('bc')
-backup=('etc/psiconv/psiconv.conf')
-options=('!libtool')
-source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8d7548e3c6b9cd408544736133728acd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD
deleted file mode 100644
index d08830b1d..000000000
--- a/testing/psmisc/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 162304 2012-06-24 20:02:02Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=psmisc
-pkgver=22.19
-pkgrel=1
-pkgdesc="Miscellaneous procfs tools"
-arch=('i686' 'x86_64')
-url="http://psmisc.sourceforge.net/index.html"
-license=('GPL')
-groups=('base')
-depends=('ncurses')
-source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('4c8fb774449f966f78c4c6e1d77d1a24b4187410')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pstoedit/PKGBUILD b/testing/pstoedit/PKGBUILD
deleted file mode 100644
index 1915d9b37..000000000
--- a/testing/pstoedit/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169648 2012-10-25 01:35:40Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Tobias Powalowski <t.powa@gmx.de>
-
-pkgname=pstoedit
-pkgver=3.60
-pkgrel=3
-pkgdesc="Translates PostScript and PDF graphics into other vector formats"
-arch=('i686' 'x86_64')
-url="http://www.pstoedit.net/"
-license=('GPL')
-depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
-makedepends=('ghostscript')
-options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
-	'pstoedit-3.50-parallel.patch'	'pstoedit-3.50-plugin-close.patch')
-sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
-          '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
-          '54bbe019de66eb4cb8525371462595d21fbd074e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's/-pedantic//' configure
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pstoedit/pstoedit-3.50-parallel.patch b/testing/pstoedit/pstoedit-3.50-parallel.patch
deleted file mode 100644
index 4f1f73b04..000000000
--- a/testing/pstoedit/pstoedit-3.50-parallel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
-         $(sample_drivers_src)                   
- libp2edrvstd_la_LIBADD=-L. libpstoedit.la
- libp2edrvstd_la_LDFLAGS=-no-undefined -module
-+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
- 
- #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
- #libp2edrvplugins_la_LIBADD=
-@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
- libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
- libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
- libp2edrvlplot_la_LDFLAGS=-no-undefined -module
-+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
- 
- libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
- libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
- libp2edrvswf_la_LDFLAGS=-no-undefined -module
-+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
- 
- # note the __ stand for ++ - automake treats all no alphanums chars as _
- libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
- libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
- libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS}  -module
-+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
- # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
- 
- if USE_EMFBYSOURCE
-@@ -113,6 +117,7 @@ else
- libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
- libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
- endif
-+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
- 
- libpstoedit_la_SOURCES =			\
- 	dynload.cpp dynload.h			\
-@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
- 
- pstoedit_SOURCES = cmdmain.cpp
- pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
-+pstoedit_DEPENDENCIES = libpstoedit.la
- 
- pkginclude_HEADERS =				\
- 	pstoedit.h				\
diff --git a/testing/pstoedit/pstoedit-3.50-plugin-close.patch b/testing/pstoedit/pstoedit-3.50-plugin-close.patch
deleted file mode 100644
index 6787d6aef..000000000
--- a/testing/pstoedit/pstoedit-3.50-plugin-close.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugzilla.redhat.com/507035
-
-diff --git a/src/dynload.cpp b/src/dynload.cpp
-index c0db355..7c073ef 100644
---- a/src/dynload.cpp
-+++ b/src/dynload.cpp
-@@ -147,7 +147,6 @@ void DynLoader::close()
- 
- DynLoader::~DynLoader()
- {
--	close();
- 	libname=0;
- }
- 
diff --git a/testing/ptlib/PKGBUILD b/testing/ptlib/PKGBUILD
deleted file mode 100644
index ed26e6d29..000000000
--- a/testing/ptlib/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169545 2012-10-23 11:47:51Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=ptlib
-pkgver=2.10.7
-pkgrel=2
-pkgdesc="Portable Windows Library"
-arch=('i686' 'x86_64')
-url="http://www.opalvoip.org"
-license=('GPL')
-depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
-replaces=('pwlib')
-conflicts=('pwlib')
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2)
-md5sums=('7fb74a97743fcc5f33d0f97dec7bc878')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc --localstatedir=/var \
-      --enable-opal --enable-plugins \
-      --enable-oss --enable-v4l2 \
-      --disable-avc --enable-sdl \
-      --enable-ipv6 --enable-v4l \
-      --enable-dc --disable-odbc \
-      --enable-expat --enable-httpforms
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pyalpm/PKGBUILD b/testing/pyalpm/PKGBUILD
deleted file mode 100644
index c9d420471..000000000
--- a/testing/pyalpm/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
-
-pkgname=pyalpm
-pkgver=0.5.3
-pkgrel=2
-pkgdesc="Libalpm bindings for Python 3"
-arch=('i686' 'x86_64')
-url="http://projects.archlinux.org/users/remy/pyalpm.git/"
-license=('GPL')
-depends=('python>=3.2' 'pacman>=4')
-source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz")
-md5sums=('a76019106d17de3a5933c773013a63d1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python setup.py build
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python setup.py install --root=${pkgdir}
-}
-
diff --git a/testing/pycrypto/PKGBUILD b/testing/pycrypto/PKGBUILD
deleted file mode 100644
index 8199704f1..000000000
--- a/testing/pycrypto/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 168845 2012-10-16 11:53:59Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-
-pkgbase=pycrypto
-pkgname=('python2-crypto' 'python-crypto')
-pkgver=2.6
-pkgrel=3
-arch=('i686' 'x86_64')
-makedepends=('python2' 'python')
-url="http://www.dlitz.net/software/pycrypto/"
-license=('custom')
-source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz")
-sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8')
-
-build() {
-  cd "${srcdir}"
-  find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \;
-  find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \;
- 
-  cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python2 setup.py build
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
-  python setup.py build
-}
-
-package_python2-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2."
-  depends=('python2')
-  replaces=('pycrypto')
-  conflicts=('pycrypto')
-  provides=("pycrypto=${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_python-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3."
-  depends=('python')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
-  python setup.py install --root="${pkgdir}" --optimize=1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/pygobject/PKGBUILD b/testing/pygobject/PKGBUILD
deleted file mode 100644
index 33f064936..000000000
--- a/testing/pygobject/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 169159 2012-10-18 19:22:49Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.4.1.1
-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::3}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('dbcff64a641b4eb251a3ca72c782c8a2318c3bbf4a31bffc40446e15111e6017')
-
-build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
-}
-
-package_python2-gobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
-
-  cd "python2-build"
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
-}
-
-package_pygobject-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-  cd "devel"
-  mkdir -p "$pkgdir"/usr/{include,lib}
-  mv include "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-}
diff --git a/testing/pygobject2/PKGBUILD b/testing/pygobject2/PKGBUILD
deleted file mode 100644
index 2aaa967e3..000000000
--- a/testing/pygobject2/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 168847 2012-10-16 11:54:08Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=pygobject2
-pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
-pkgver=2.28.6
-pkgrel=7
-arch=('i686' 'x86_64')
-url="http://www.pygtk.org/"
-license=('LGPL')
-makedepends=('python' 'python2')
-source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
-        python2-fix-type.patch
-        python3-fix-build.patch
-        python3-fix-maketrans.patch)
-options=('!libtool')
-sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
-            'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
-            'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
-            '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
-
-build() {
-  cd "${srcdir}"
-  cp -a "pygobject-${pkgver}" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
-
-  (
-    cd "pygobject-${pkgver}"
-    #patches available in 2.28 branch but unreleased.
-    patch -Np1 -i "${srcdir}/python2-fix-type.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-build.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
-
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
-}
-
-package_python-gobject2() {
-  pkgdesc="Python 3 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python')
-  replaces=('py3gobject')
-  provides=("py3gobject=$pkgver")
-
-  cd "${srcdir}/pygobject-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Delete devel stuff
-  rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
-}
-
-package_python2-gobject2() {
-  pkgdesc="Python 2 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python2')
-  replaces=('pygobject')
-  provides=("pygobject=$pkgver")
-
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
-
-  find "$pkgdir"/usr/share/pygobject -name '*.py' | \
-    xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  # Split devel stuff
-  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
-    "$srcdir/devel/"
-}
-
-package_pygobject2-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-
-  cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
-
-  mv include   "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-  mv gtk-doc   "$pkgdir/usr/share/"
-  mv xsl       "$pkgdir/usr/share/pygobject/"
-}
diff --git a/testing/pygobject2/python2-fix-type.patch b/testing/pygobject2/python2-fix-type.patch
deleted file mode 100644
index 78e7ddfd5..000000000
--- a/testing/pygobject2/python2-fix-type.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Mon, 12 Mar 2012 16:44:14 -0400
-Subject: gio-types.defs: change some enums to flags
-
-These flags types were originally incorrectly handled in glib as being
-enums.  That bug was fixed, but they're still enums here, leading to
-warnings about the mismatch.
-
-Change them to flags.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668522
----
- gio/gio-types.defs |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gio/gio-types.defs b/gio/gio-types.defs
-index 331e0bc..7eee5c8 100644
---- a/gio/gio-types.defs
-+++ b/gio/gio-types.defs
-@@ -526,7 +526,7 @@
-   )
- )
- 
--(define-enum MountMountFlags
-+(define-flags MountMountFlags
-   (in-module "gio")
-   (c-name "GMountMountFlags")
-   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
-@@ -545,7 +545,7 @@
-   )
- )
- 
--(define-enum DriveStartFlags
-+(define-flags DriveStartFlags
-   (in-module "gio")
-   (c-name "GDriveStartFlags")
-   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
-@@ -770,7 +770,7 @@
-   )
- )
- 
--(define-enum SocketMsgFlags
-+(define-flags SocketMsgFlags
-   (in-module "gio")
-   (c-name "GSocketMsgFlags")
-   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
--- 
-1.7.9.1
-
diff --git a/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/pyopenssl/PKGBUILD b/testing/pyopenssl/PKGBUILD
deleted file mode 100644
index e953a7690..000000000
--- a/testing/pyopenssl/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 168849 2012-10-16 11:54:13Z allan $
-# Maintainer : Ionut Biru<ibiru@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgbase=pyopenssl
-pkgname=('python-pyopenssl' 'python2-pyopenssl')
-pkgver=0.13
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/pyOpenSSL"
-license=('LGPL2.1')
-makedepends=('python' 'python2' 'openssl')
-source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
-md5sums=('767bca18a71178ca353dff9e10941929')
-
-build() {
-    cd "${srcdir}"
-    cp -a "pyOpenSSL-${pkgver}"{,-python2}
-
-    #build python 3 module
-    cd "pyOpenSSL-${pkgver}"
-    python setup.py build
-
-    #build python 2 module
-    cd ../"pyOpenSSL-${pkgver}-python2"
-    python2 setup.py build
-}
-
-package_python-pyopenssl(){
-    pkgdesc="Python3 wrapper module around the OpenSSL library"
-    depends=('python>=3.3' 'openssl')
-    replaces=('pyopenssl')
-    provides=('pyopenssl')
-    conflicts=('pyopenssl')
-
-    cd "${srcdir}/pyOpenSSL-${pkgver}"
-    python setup.py install --root "${pkgdir}" --optimize=1
-}
-
-package_python2-pyopenssl(){
-    pkgdesc="Python2 wrapper module around the OpenSSL library"
-    depends=('python2>=2.7' 'openssl')
-
-    cd "${srcdir}/pyOpenSSL-${pkgver}-python2"
-    python2 setup.py install --root "${pkgdir}" --optimize=1
-}
diff --git a/testing/pyqt/PKGBUILD b/testing/pyqt/PKGBUILD
deleted file mode 100644
index 070912482..000000000
--- a/testing/pyqt/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 168850 2012-10-16 11:54:15Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.5
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
-             'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('e4cdd6619c63655f7510efb4df8462fb')
-
-build() {
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd PyQt-x11-gpl-${pkgver}
-  python configure.py \
-    --confirm-license \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd ../Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
-    --confirm-license \
-    -v /usr/share/sip \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
-  
-  cd PyQt-x11-gpl-${pkgver}
-  make -C pyrcc DESTDIR="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" install
-  
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-
-  cd PyQt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  provides=('python2-qt')
-
-  cd Py2Qt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Fix conflicts with pyqt
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
-  
-  # Provided by pyqt
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/testing/pyqt/fix-qthelp-build.patch b/testing/pyqt/fix-qthelp-build.patch
deleted file mode 100644
index 6055f9f35..000000000
--- a/testing/pyqt/fix-qthelp-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- PyQt-x11-gpl-4.9.1/configure.py~	2012-02-13 20:16:11.418786488 +0000
-+++ PyQt-x11-gpl-4.9.1/configure.py	2012-02-13 20:16:50.561809527 +0000
-@@ -1261,7 +1261,7 @@
-     opengl = (mname == "QtOpenGL")
- 
-     qt = [mname]
--    if mname in ("QtOpenGL", "QtWebKit"):
-+    if mname in ("QtHelp", "QtOpenGL", "QtWebKit"):
-         qt.append("QtCore")
- 
-     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
diff --git a/testing/python-cairo/PKGBUILD b/testing/python-cairo/PKGBUILD
deleted file mode 100644
index 7efdd37a4..000000000
--- a/testing/python-cairo/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168854 2012-10-16 11:54:24Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>  
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=python-cairo
-pkgver=1.10.0
-pkgrel=2
-pkgdesc="Python bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
-license=('LGPL3')
-depends=('python' 'cairo')
-makedepends=('pkg-config')
-options=('!libtool')
-source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
-url="http://www.cairographics.org/pycairo"
-md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
-
-build() {
-  cd "${srcdir}/pycairo-${pkgver}"
-
-  # Ensure that ./waf has created the cached unpacked version
-  # of the wafadmin source tree.
-  # This will be created to a subdirectory like
-  #    .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
-  python3 ./waf --version
-
-  ./waf configure --prefix=/usr
-  ./waf build
-}
-
-package() {
-  cd "${srcdir}/pycairo-${pkgver}"
-  ./waf install --destdir="${pkgdir}"
-}
diff --git a/testing/python-egenix-mx-base/PKGBUILD b/testing/python-egenix-mx-base/PKGBUILD
deleted file mode 100644
index c2e1b4fa9..000000000
--- a/testing/python-egenix-mx-base/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168902 2012-10-16 14:06:20Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=python-egenix-mx-base
-pkgname=('python2-egenix-mx-base')
-_origname=egenix-mx-base
-pkgver=3.2.4
-pkgrel=3
-pkgdesc="A collection of Python tools"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.egenix.com/products/python/mxBase/"
-makedepends=('python2')
-conflicts=('python-egenix-mx-base<=3.2.4-1')
-replaces=('python-egenix-mx-base<=3.2.4-1')
-source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7')
-
-build() {
-  cd "${srcdir}/${_origname}-${pkgver}"
-
-  find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \;
-
-  python2 setup.py build
-}
-
-package_python2-egenix-mx-base() {
-  depends=('python2>=2.7')
-  cd "${srcdir}/${_origname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1
-  install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/python-iwscan/PKGBUILD b/testing/python-iwscan/PKGBUILD
deleted file mode 100644
index a32038290..000000000
--- a/testing/python-iwscan/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168860 2012-10-16 11:54:37Z allan $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgbase=python-iwscan
-pkgname=python2-iwscan
-pkgver=20090609
-pkgrel=4
-pkgdesc="A Python interface to iwlist, using the iwlib library"
-arch=('i686' 'x86_64')
-url="http://projects.otaku42.de/browser/python-iwscan"
-license=('LGPL')
-depends=('python2' 'wireless_tools')
-conflicts=('python-iwscan<=20090609-3')
-replaces=('python-iwscan<=20090609-3')
-source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz)
-md5sums=('30fbe8ad3b07e67c1c35db2de16077d8')
-
-build() {
-	cd "${srcdir}/${pkgbase}"
-	python2 setup.py build
-}
-
-package_python2-iwscan() {
-	cd "${srcdir}/${pkgbase}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/testing/python-lxml/PKGBUILD b/testing/python-lxml/PKGBUILD
deleted file mode 100644
index 8980d9da3..000000000
--- a/testing/python-lxml/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168863 2012-10-16 11:54:46Z allan $
-# Maintainer:
-
-pkgname=('python-lxml' 'python2-lxml')
-pkgver=3.0
-pkgrel=1
-pkgdesc="Python binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64')
-license=('BSD' 'custom')
-url="http://lxml.de/"
-makedepends=('python2' 'python' 'libxslt')
-source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441'
-          'b38447fd3f9cfb30b4d56ffe3bec42739afb2947')
-
-check() {
-  cd "${srcdir}"/lxml-$pkgver
-  make PYTHON=python2 test
-  make PYTHON=python test
-}
-
-package_python2-lxml() {
-  depends=('python2' 'libxslt')
-  optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML')
-
-  cd "${srcdir}"/lxml-$pkgver
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}
-
-package_python-lxml() {
-  depends=('python' 'libxslt')
-
-  cd "${srcdir}"/lxml-$pkgver
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}
diff --git a/testing/python-markupsafe/PKGBUILD b/testing/python-markupsafe/PKGBUILD
deleted file mode 100644
index 8de9c9363..000000000
--- a/testing/python-markupsafe/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 168865 2012-10-16 11:54:52Z allan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
-
-pkgname=('python-markupsafe' 'python2-markupsafe')
-pkgver=0.15
-pkgrel=2
-pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/MarkupSafe"
-license=('custom')
-makedepends=('python-distribute' 'python2-distribute')
-source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
-
-build() {
-  cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
-  cd "${srcdir}/MarkupSafe-${pkgver}"
-  python setup.py build
-
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
-  python2 setup.py build
-}
-
-package_python-markupsafe() {
-  depends=('python')
-
-  cd "${srcdir}/MarkupSafe-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
-}
-
-package_python2-markupsafe() {
-  depends=('python2')
-
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
-}
diff --git a/testing/python-notify/PKGBUILD b/testing/python-notify/PKGBUILD
deleted file mode 100644
index 674fb34c1..000000000
--- a/testing/python-notify/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168868 2012-10-16 11:55:02Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-
-pkgbase=python-notify
-pkgname=python2-notify
-pkgver=0.1.1
-pkgrel=12
-pkgdesc="Python bindings for libnotify"
-arch=('i686' 'x86_64')
-url="http://www.galago-project.org/"
-license=('GPL')
-depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
-makedepends=('python2')
-conflicts=('python-notify<=0.1.1-11')
-replaces=('python-notify<=0.1.1-11')
-options=(!libtool)
-source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
-        libnotify07.patch
-        notify-python-0.1.1-fix-GTK-symbols.patch)
-md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
-         'b40c4542575d5aef559908fe60a21634'
-         'c6922028da5951e69a6a0167bdb4461c')
-
-build() {
-    cd "${srcdir}/notify-python-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/libnotify07.patch"
-    patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch"
-
-    ./configure --prefix=/usr
-
-    # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c
-    # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed
-    touch src/pynotify.override
-
-    make clean
-    make
-}
-
-package_python2-notify() {
-    cd "${srcdir}/notify-python-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/python-notify/libnotify07.patch b/testing/python-notify/libnotify07.patch
deleted file mode 100644
index 289573d50..000000000
--- a/testing/python-notify/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070	2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs	2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
-     '("const-gchar*" "summary")
-     '("const-gchar*" "message" (null-ok) (default "NULL"))
-     '("const-gchar*" "icon" (null-ok) (default "NULL"))
--    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
-   )
- )
- 
-@@ -53,24 +52,6 @@
-   )
- )
- 
--(define-method attach_to_widget
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_widget")
--  (return-type "none")
--  (parameters
--    '("GtkWidget*" "attach")
--  )
--)
--
--(define-method attach_to_status_icon
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_status_icon")
--  (return-type "none")
--  (parameters
--    '("GtkStatusIcon*" "attach")
--  )
--)
--
- (define-method show
-   (of-object "NotifyNotification")
-   (c-name "notify_notification_show")
diff --git a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c0136..000000000
--- a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD	2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py	2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/testing/python-numpy/PKGBUILD b/testing/python-numpy/PKGBUILD
deleted file mode 100755
index e295dec87..000000000
--- a/testing/python-numpy/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 168869 2012-10-16 11:55:07Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-
-pkgbase=python-numpy
-pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.7.0
-_pkgver=1.7.0b2
-pkgrel=1
-pkgdesc="Scientific tools for Python"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://numpy.scipy.org/"
-makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz)
-md5sums=('1b62cf0e34e2db58b0241b00d603df24')
-
-build() {
-  cd "${srcdir}"
-  cp -a numpy-${_pkgver} numpy-py2-${_pkgver}
-
-  export Atlas=None
-  export LDFLAGS="$LDFLAGS -shared"
-
-  echo "Building Python2"
-  cd "${srcdir}/numpy-py2-${_pkgver}"
-  python2 setup.py config_fc --fcompiler=gnu95 build
-
-  echo "Building Python3"
-  cd "${srcdir}/numpy-${_pkgver}"
-  python setup.py config_fc --fcompiler=gnu95 build
-}
-
-package_python2-numpy() {
-  depends=('lapack' 'python2')
-  optdepends=('python-nose: testsuite')
-
-  cd "${srcdir}/numpy-py2-${_pkgver}"
-  python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/"
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-         -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-             $(find ${pkgdir} -name '*.py')
-}
-
-package_python-numpy() {
-  depends=('lapack' 'python')
-  provides=("python3-numpy=${pkgver}")
-  replaces=('python3-numpy')
-  conflicts=('python3-numpy')
-
-  cd "${srcdir}/numpy-${_pkgver}"
-  python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
-}
diff --git a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
deleted file mode 100644
index 072afbc0e..000000000
--- a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
-index 00c71f9..0afdc17 100644
---- a/numpy/core/src/multiarray/scalarapi.c
-+++ b/numpy/core/src/multiarray/scalarapi.c
-@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
-             itemsize = (((itemsize - 1) >> 2) + 1) << 2;
-         }
-     }
-+#if PY_VERSION_HEX >= 0x03030000
-+    if (type_num == NPY_UNICODE) {
-+        PyObject *u, *args;
-+        char *buffer;
-+        if (swap) {
-+            buffer = malloc(itemsize);
-+            if (buffer == NULL) {
-+                PyErr_NoMemory();
-+                return NULL;
-+            }
-+            memcpy(buffer, data, itemsize);
-+            byte_swap_vector(buffer, itemsize >> 2, 4);
-+        } else {
-+            buffer = data;
-+        }
-+        u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer,
-+                itemsize >> 2);
-+        if (swap) {
-+            free(buffer);
-+        }
-+        if (u == NULL) {
-+            return NULL;
-+        }
-+        args = Py_BuildValue("(O)", u);
-+        if (args == NULL) {
-+            Py_DECREF(u);
-+            return NULL;
-+        }
-+        obj = type->tp_new(type, args, NULL);
-+        Py_DECREF(u);
-+        Py_DECREF(args);
-+        return obj;
-+    }
-+#endif
-     if (type->tp_itemsize != 0) {
-         /* String type */
-         obj = type->tp_alloc(type, itemsize);
-@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
-             memcpy(destptr, data, itemsize);
-             return obj;
-         }
-+#if PY_VERSION_HEX < 0x03030000
-         else if (type_num == PyArray_UNICODE) {
-             /* tp_alloc inherited from Python PyBaseObject_Type */
-             PyUnicodeObject *uni = (PyUnicodeObject*)obj;
-@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
- #endif
-             return obj;
-         }
-+#endif // PY_VERSION_HEX < 0x03030000
-         else {
-             PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj;
-             vobj->base = NULL;
-diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
-index e547071..12745d7 100644
---- a/numpy/core/src/multiarray/scalartypes.c.src
-+++ b/numpy/core/src/multiarray/scalartypes.c.src
-@@ -2592,7 +2592,11 @@ finish:
-     *((npy_@name@ *)dest) = *((npy_@name@ *)src);
- #elif @default@ == 1 /* unicode and strings */
-     if (itemsize == 0) { /* unicode */
-+#if PY_VERSION_HEX >= 0x03030000
-+        itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj);
-+#else
-         itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE);
-+#endif
-     }
-     memcpy(dest, src, itemsize);
-     /* @default@ == 2 won't get here */
-diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
-index c4147ef..119056c 100644
---- a/numpy/core/src/multiarray/methods.c
-+++ b/numpy/core/src/multiarray/methods.c
-@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
-     if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
-         int swap=!PyArray_ISNOTSWAPPED(self);
-         self->data = datastr;
--        if (!_IsAligned(self) || swap) {
-+        if (!_IsAligned(self) || swap || (len <= 1000)) {
-             intp num = PyArray_NBYTES(self);
-             self->data = PyDataMem_NEW(num);
-             if (self->data == NULL) {
--- 
-1.7.12.3
diff --git a/testing/python-pyspi/PKGBUILD b/testing/python-pyspi/PKGBUILD
deleted file mode 100644
index 0fb75b940..000000000
--- a/testing/python-pyspi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168874 2012-10-16 11:55:20Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-pyspi
-pkgname=python2-pyspi
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="Python AT-SPI bindings"
-arch=('i686' 'x86_64')
-url="http://people.redhat.com/zcerza/dogtail"
-license=('LGPL')
-depends=('python2' 'at-spi')
-makedepends=('pyrex')
-conflicts=('python-pyspi<=0.6.1-5')
-conflicts=('python-pyspi<=0.6.1-5')
-source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz"
-        'pyspi-build.patch')
-md5sums=('def336bd566ea688a06ec03db7ccf1f4'
-         '721f74cbae653a258c00b83acf7dd1da')
-
-build() {
-  cd ${srcdir}/pyspi-${pkgver}
-  patch -Np1 -i ${srcdir}/pyspi-build.patch
-  # Pyrex tells us to use __cinit__ instead of __new__
-  sed -i 's/__new__/__cinit__/' pyspi.pyx
-}
-
-package_python2-pyspi() {
-  cd ${srcdir}/pyspi-${pkgver}
-  python2 setup.py install --root=${pkgdir}
-}
diff --git a/testing/python-pyspi/pyspi-build.patch b/testing/python-pyspi/pyspi-build.patch
deleted file mode 100644
index 3d12c5ed5..000000000
--- a/testing/python-pyspi/pyspi-build.patch
+++ /dev/null
@@ -1,1693 +0,0 @@
-diff -Naur pyspi-0.6.1-old/cspi.pxd pyspi-0.6.1/cspi.pxd
---- pyspi-0.6.1-old/cspi.pxd	2006-08-04 06:27:10.000000000 +1000
-+++ pyspi-0.6.1/cspi.pxd	2009-05-09 15:24:31.000000000 +1000
-@@ -14,9 +14,7 @@
- 
- 	ctypedef struct AccessibleTextRange
- 	ctypedef struct AccessibleKeySet
--	ctypedef enum SPIBoolean:
--		FALSE = 0,
--		TRUE
-+	ctypedef unsigned int SPIBoolean
- 
- 	ctypedef struct AccessibleEvent:
- 		char  *type
-diff -Naur pyspi-0.6.1-old/pyspi.pyx pyspi-0.6.1/pyspi.pyx
---- pyspi-0.6.1-old/pyspi.pyx	2006-10-03 02:46:41.000000000 +1000
-+++ pyspi-0.6.1/pyspi.pyx	2009-05-09 15:24:31.000000000 +1000
-@@ -25,9 +25,15 @@
- cdef class Event (EventBase)
- cdef class DeviceEvent
- 
--ctypedef enum bool:
-+ctypedef unsigned int bool
-+
-+import __builtin__
-+try:
-+	False = __builtin__.False
-+	True = __builtin__.True
-+except AttributeError:
- 	False = 0
--	True
-+	True = 1
- 
- # SPIExceptionCode values:
- (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
-@@ -731,7 +737,7 @@
- 	Wrapper around the low-level cspi.AccessibleComponent_ functions,
- 	giving an OO-style API.
- 	"""
--	def getExtents (self, type=0):
-+	def getExtents (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleComponent_getExtents, returning an
- 		(x,y,w,h) tuple.
-@@ -741,7 +747,7 @@
- 		cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type)
- 		return (x, y, w, h)
- 
--	def getPosition (self, type = 0):
-+	def getPosition (self, key_type = 0):
- 		"""
- 		Wraps cspi.AccessibleComponent_getPosition, returning an
- 		(x,y) tuple.
-@@ -991,11 +997,11 @@
- 		Wraps cspi.AccessibleHyperlink_getObject
- 		"""
- 		self.__checkSelf ()
--		cdef Accessible object
--		object = Accessible ()
--		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
--		object.__checkSelf ()
--		return object
-+		cdef Accessible obj
-+		obj = Accessible ()
-+		obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-+		obj.__checkSelf ()
-+		return obj
- 
- 	def getURI (self, i):
- 		"""
-@@ -1032,7 +1038,7 @@
- 		cspi.AccessibleImage_getImageSize(self.__item, &w, &h);
- 		return [w, h]
- 
--	def getImagePosition (self, type=0):
-+	def getImagePosition (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y)
- 		pair
-@@ -1042,7 +1048,7 @@
- 		cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type)
- 		return [x, y]
- 
--	def getImageExtents (self, type=0):
-+	def getImageExtents (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleImage_getImageExtents, returning a
- 		(x,y,w,h) tuple
-@@ -1551,7 +1557,7 @@
- 	cdef cspi.AccessibleDeviceListener *__item
- 	cdef public object modMasks
- 
--	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
-+	def __init__ (self, callback, eventMask = <int> cspi.SPI_KEY_PRESSED | <int> cspi.SPI_KEY_RELEASED):
- 		"""
- 		Registers a python callback function to be called.
- 
-diff -Naur pyspi-0.6.1-old/pyspi.pyx.orig pyspi-0.6.1/pyspi.pyx.orig
---- pyspi-0.6.1-old/pyspi.pyx.orig	1970-01-01 10:00:00.000000000 +1000
-+++ pyspi-0.6.1/pyspi.pyx.orig	2006-10-03 02:46:41.000000000 +1000
-@@ -0,0 +1,1592 @@
-+# Authors:
-+#          Zack Cerza <zcerza@redhat.com>
-+#          Chris Lee <clee@redhat.com>
-+#          Lawrence Lim <llim@redhat.com>
-+#          David Malcolm <dmalcolm@redhat.com>
-+
-+cdef class Registry
-+
-+cdef class Base
-+cdef class EventBase
-+cdef class StateSet
-+cdef class Accessible (Base)
-+cdef class Desktop (Accessible)
-+cdef class Application (Accessible)
-+cdef class Component (Accessible)
-+cdef class Action (Base)
-+cdef class Text (Base)
-+cdef class EditableText (Text)
-+cdef class Hypertext (Text)
-+cdef class Hyperlink (Base)
-+cdef class Image (Base)
-+cdef class Value (Base)
-+cdef class Selection (Base)
-+cdef class Table (Base)
-+cdef class Event (EventBase)
-+cdef class DeviceEvent
-+
-+ctypedef enum bool:
-+	False = 0
-+	True
-+
-+# SPIExceptionCode values:
-+(SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
-+
-+# SPIExceptionType values:
-+(SPI_EXCEPTION_SOURCE_UNSPECIFIED, SPI_EXCEPTION_SOURCE_ACCESSIBLE, SPI_EXCEPTION_SOURCE_REGISTRY, SPI_EXCEPTION_SOURCE_DEVICE)=range(4)
-+
-+# Accessible roles
-+(SPI_ROLE_INVALID, SPI_ROLE_ACCEL_LABEL, SPI_ROLE_ALERT, SPI_ROLE_ANIMATION, SPI_ROLE_ARROW, SPI_ROLE_CALENDAR, SPI_ROLE_CANVAS, SPI_ROLE_CHECK_BOX, SPI_ROLE_CHECK_MENU_ITEM, SPI_ROLE_COLOR_CHOOSER, SPI_ROLE_COLUMN_HEADER, SPI_ROLE_COMBO_BOX, SPI_ROLE_DATE_EDITOR, SPI_ROLE_DESKTOP_ICON, SPI_ROLE_DESKTOP_FRAME, SPI_ROLE_DIAL, SPI_ROLE_DIALOG, SPI_ROLE_DIRECTORY_PANE, SPI_ROLE_DRAWING_AREA, SPI_ROLE_FILE_CHOOSER, SPI_ROLE_FILLER, SPI_ROLE_FONT_CHOOSER, SPI_ROLE_FRAME, SPI_ROLE_GLASS_PANE, SPI_ROLE_HTML_CONTAINER, SPI_ROLE_ICON, SPI_ROLE_IMAGE, SPI_ROLE_INTERNAL_FRAME, SPI_ROLE_LABEL, SPI_ROLE_LAYERED_PANE, SPI_ROLE_LIST, SPI_ROLE_LIST_ITEM, SPI_ROLE_MENU, SPI_ROLE_MENU_BAR, SPI_ROLE_MENU_ITEM, SPI_ROLE_OPTION_PANE, SPI_ROLE_PAGE_TAB, SPI_ROLE_PAGE_TAB_LIST, SPI_ROLE_PANEL, SPI_ROLE_PASSWORD_TEXT, SPI_ROLE_POPUP_MENU, SPI_ROLE_PROGRESS_BAR, SPI_ROLE_PUSH_BUTTON, SPI_ROLE_RADIO_BUTTON, SPI_ROLE_RADIO_MENU_ITEM, SPI_ROLE_ROOT_PANE, SPI_ROLE_ROW_HEADER, SPI_ROLE_SCROLL_BAR, SPI_ROLE_SCROLL_PANE, SPI_ROLE_SEPARATOR, SPI_ROLE_SLIDER, SPI_ROLE_SPIN_BUTTON, SPI_ROLE_SPLIT_PANE, SPI_ROLE_STATUS_BAR, SPI_ROLE_TABLE, SPI_ROLE_TABLE_CELL, SPI_ROLE_TABLE_COLUMN_HEADER, SPI_ROLE_TABLE_ROW_HEADER, SPI_ROLE_TEAROFF_MENU_ITEM, SPI_ROLE_TERMINAL, SPI_ROLE_TEXT, SPI_ROLE_TOGGLE_BUTTON, SPI_ROLE_TOOL_BAR, SPI_ROLE_TOOL_TIP, SPI_ROLE_TREE, SPI_ROLE_TREE_TABLE, SPI_ROLE_UNKNOWN, SPI_ROLE_VIEWPORT, SPI_ROLE_WINDOW, SPI_ROLE_EXTENDED, SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH, SPI_ROLE_RULER, SPI_ROLE_APPLICATION, SPI_ROLE_AUTOCOMPLETE, SPI_ROLE_EDITBAR, SPI_ROLE_EMBEDDED, SPI_ROLE_LAST_DEFINED)=range(79)
-+
-+# Accessible states
-+(SPI_STATE_INVALID, SPI_STATE_ACTIVE, SPI_STATE_ARMED, SPI_STATE_BUSY, SPI_STATE_CHECKED, SPI_STATE_COLLAPSED, SPI_STATE_DEFUNCT, SPI_STATE_EDITABLE, SPI_STATE_ENABLED, SPI_STATE_EXPANDABLE, SPI_STATE_EXPANDED, SPI_STATE_FOCUSABLE, SPI_STATE_FOCUSED, SPI_STATE_HORIZONTAL, SPI_STATE_ICONIFIED, SPI_STATE_MODAL, SPI_STATE_MULTI_LINE, SPI_STATE_MULTISELECTABLE, SPI_STATE_OPAQUE, SPI_STATE_PRESSED, SPI_STATE_RESIZABLE, SPI_STATE_SELECTABLE, SPI_STATE_SELECTED, SPI_STATE_SENSITIVE, SPI_STATE_SHOWING, SPI_STATE_SINGLE_LINE, SPI_STATE_STALE, SPI_STATE_TRANSIENT, SPI_STATE_VERTICAL, SPI_STATE_VISIBLE, SPI_STATE_MANAGES_DESCENDANTS, SPI_STATE_INDETERMINATE) = range(32);
-+
-+# Accessible relation types
-+(SPI_RELATION_NULL, SPI_RELATION_LABEL_FOR, SPI_RELATION_LABELED_BY, SPI_RELATION_CONTROLLER_FOR, SPI_RELATION_CONTROLLED_BY, SPI_RELATION_MEMBER_OF, SPI_RELATION_NODE_CHILD_OF, SPI_RELATION_EXTENDED, SPI_RELATION_FLOWS_TO, SPI_RELATION_FLOWS_FROM, SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY, SPI_RELATION_POPUP_FOR, SPI_RELATION_LAST_DEFINED) = range (15);
-+
-+# AccessibleComponent layers
-+(SPI_LAYER_INVALID, SPI_LAYER_BACKGROUND, SPI_LAYER_CANVAS, SPI_LAYER_WIDGET, SPI_LAYER_MDI, SPI_LAYER_POPUP, SPI_LAYER_OVERLAY, SPI_LAYER_WINDOW, SPI_LAYER_LAST_DEFINED) = range(9)
-+
-+#AccessibleKeySynthType
-+(SPI_KEY_PRESS, SPI_KEY_RELEASE, SPI_KEY_PRESSRELEASE, SPI_KEY_SYM, SPI_KEY_STRING) = range(5)
-+
-+# AccessibleKeyListenerSyncType
-+(SPI_KEYLISTENER_NOSYNC, SPI_KEYLISTENER_SYNCHRONOUS, SPI_KEYLISTENER_CANCONSUME, SPI_KEYLISTENER_ALL_WINDOWS) = range(4)
-+
-+# AccessibleDeviceEventType
-+SPI_KEY_PRESSED  = 1<<0
-+SPI_KEY_RELEASED = 1<<1
-+SPI_BUTTON_PRESSED = 1<<2
-+SPI_BUTTON_RELEASED = 1<<3
-+
-+cdef cspi.AccessibleKeySet *SPI_KEYSET_ALL_KEYS
-+SPI_KEYSET_ALL_KEYS = NULL
-+
-+Accessibility_MODIFIER_SHIFT = 1 << 0
-+Accessibility_MODIFIER_SHIFTLOCK = 1 << 1
-+Accessibility_MODIFIER_CONTROL = 1 << 2
-+Accessibility_MODIFIER_ALT = 1 << 3
-+Accessibility_MODIFIER_META = 1 << 4
-+Accessibility_MODIFIER_META2 = 1 << 5
-+Accessibility_MODIFIER_META3 = 1 << 6
-+Accessibility_MODIFIER_NUMLOCK = 1 << 7
-+
-+
-+cdef object string(char * string):
-+	cdef object pyString
-+	pyString = string
-+	cspi.SPI_freeString(string)
-+	return pyString
-+
-+import os
-+class X11Exception(Exception):
-+	def __init__(self, display = os.environ.get('DISPLAY', None)):
-+		self.display = display
-+	def __str__(self):
-+		msg = "Cannot open display"
-+		if self.display: return msg + ': ' + self.display
-+		else: return msg
-+
-+class AtspiException(Exception):
-+	"""
-+	Exceptions raised when calls to the AT-SPI C bindings return FALSE to
-+	indicate failure.
-+	"""
-+	def __init__(self, message):
-+		self.message = message
-+
-+	def __str__(self):
-+		return "AtspiException: %s"%self.message
-+
-+class SpiException(Exception):
-+	"""
-+	Exceptions to be raised in response to an installed
-+	SPIExceptionHandler, corresponding to a SPIException.  These appear to
-+	be short-lived structs, so we gather all applicable data immediately
-+	"""
-+	def __init__(self, is_fatal, sourceType, exceptionCode, description):
-+		# print "got to __init__"
-+		self.fatal = is_fatal
-+		self.sourceType = sourceType
-+		self.exceptionCode = exceptionCode
-+		self.description = description
-+		
-+		# print "leaving __init__"
-+		# print self.fatal
-+		# print self.sourceType
-+		# print self.exceptionCode
-+		# print self.description
-+
-+	def __str__(self):
-+		if self.fatal:
-+			fatalStr = "Fatal"
-+		else:
-+			fatalStr = "Non-fatal"
-+		result = '%s SPIException: type:%s source:%s "%s"'%(fatalStr, self.sourceType, self.exceptionCode, self.description)
-+		return result
-+
-+cdef make_exception(cspi.SPIException *err, cspi.SPIBoolean is_fatal):
-+	# Don't attempt to use SPIAccessibleException_getSource; this is error
-+	# handling code, we don't want to introduce further complications
-+	return SpiException(is_fatal,
-+			    cspi.SPIException_getSourceType (err),
-+			    cspi.SPIException_getExceptionCode (err),
-+			    cspi.SPIException_getDescription (err))
-+
-+	
-+def event_main():
-+	cspi.SPI_event_main()
-+
-+def event_quit():
-+	cspi.SPI_event_quit()
-+
-+cdef cspi.SPIBoolean exception_handler (cspi.SPIException *err, cspi.SPIBoolean is_fatal) except *:
-+	# print "got exception!!!"
-+	e = make_exception(err, is_fatal)
-+	raise e
-+
-+# at-spi-<version>/cpsi.h contains:
-+#   typedef SPIBoolean (*SPIExceptionHandler) (SPIException *err, SPIBoolean is_fatal);
-+# and
-+#   SPIBoolean SPI_exceptionHandlerPush (SPIExceptionHandler *handler);
-+# There's thus an extra unnecessary level of indirection.
-+# We have to jump through the following hoops to get pyrex to deal with this:
-+cdef cspi.SPIExceptionHandler exception_handler_as_type
-+cdef cspi.SPIExceptionHandler* exception_handler_ptr
-+exception_handler_as_type = exception_handler
-+exception_handler_ptr = &exception_handler_as_type
-+
-+global_exception = None
-+
-+cdef class Registry:
-+	def __init__ (self):
-+		cdef Xlib.Display *display
-+		display = Xlib.XOpenDisplay(NULL)
-+		if display == NULL:
-+			raise X11Exception
-+		else:
-+			Xlib.XCloseDisplay(display)
-+
-+		result = cspi.SPI_init ()
-+		#if result!=0:
-+		#	raise AtspiException("SPI_init: exit code %s" % str(result))
-+
-+		result = cspi.SPI_exceptionHandlerPush (exception_handler_ptr)
-+		if not result:
-+			raise AtspiException("Unable to install SPI exception handler")
-+
-+	def __dealloc (self):
-+		result = cspi.SPI_exit ()
-+		if result!=0:
-+			raise AtspiException("SPI_init: exit code %s" % str(result))
-+
-+	def getDesktopCount (self):
-+		return cspi.SPI_getDesktopCount()
-+
-+	def getDesktop (self, index = 0):
-+		cdef Desktop desktop
-+		desktop = Desktop ()
-+		if not desktop.__setItem (cspi.SPI_getDesktop (index)):
-+			return False
-+		return desktop
-+
-+	def getDesktopList (self):
-+		# Using the bonobo.activation bindings, getDesktopList() returns a 
-+		# Python list of Desktop objects. The C bindings seem to do it differently,
-+		# and Pyrex doesn't like that method. So we're re-implementing the function
-+		# using getDesktopCount() and getDesktop() to work around that.
-+		# Yay for Zack!
-+		#
-+		#	-Zack
-+		cdef Desktop desktop
-+		desktops = []
-+		desktop = Desktop ()
-+		for i in xrange (cspi.SPI_getDesktopCount ()):
-+			desktop.__setItem (cspi.SPI_getDesktop (i))
-+			desktops = desktops + [desktop]
-+		return desktops
-+
-+registry = Registry()
-+
-+cdef class Base:
-+	"""
-+	Wrapper around a cspi.Accessible
-+	"""
-+	
-+	cdef cspi.Accessible *__item
-+	
-+	def __new__ (self):
-+		self.__item = NULL
-+	
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.Accessible_unref (self.__item)
-+
-+	cdef bool __setItem (self, cspi.Accessible *obj):
-+		if self.__item != NULL:
-+			cspi.Accessible_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.Accessible_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+	
-+	def __checkSelf (self):
-+		assert self.__item != NULL
-+
-+# WHY OH WHY won't this work? :(
-+# I need to be able to find out of two Accessible classes contain
-+# the same cspi.Accessible objects.
-+#
-+#	def isSameAs (self, base):
-+#		cdef bool foo
-+#		foo = self.__item == base.__item
-+#		return foo
-+
-+cdef class EventBase:
-+	"""
-+	Wrapper around a cspi.AccessibleEvent
-+	"""
-+	cdef cspi.AccessibleEvent *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleEvent_unref (self.__item)
-+
-+	cdef bool __setItem (self, cspi.AccessibleEvent *obj):
-+		if self.__item != NULL: 
-+			cspi.AccessibleEvent_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleEvent_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	def __getattr__ (self, attrName):
-+		cdef cspi.Accessible* acc
-+		cdef Accessible result
-+		if attrName == "source":
-+			acc = self.__item.source
-+			if acc!=NULL:
-+				result = Accessible ()
-+				result.__setItem (acc)
-+				return result
-+		elif attrName == "detail1":
-+			detail1 = self.__item.detail1
-+			return detail1
-+		elif attrName == "detail2":
-+			detail1 = self.__item.detail2
-+			return detail1
-+		elif attrName == "type":
-+			return self.__item.type
-+
-+cdef class StateSet:
-+	"""
-+	Wrapper around a cspi.AccessibleStateSet
-+	"""
-+	cdef cspi.AccessibleStateSet *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleStateSet_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	cdef bool __setItem (self, cspi.AccessibleStateSet *obj):
-+		if self.__item != NULL:
-+			cspi.AccessibleStateSet_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleStateSet_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	cdef bool __contains (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		return cspi.AccessibleStateSet_contains (self.__item, s)
-+
-+	def contains (self, state):
-+		self.__checkSelf ()
-+		return self.__contains(state)
-+
-+	cdef void __add (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		cspi.AccessibleStateSet_add(self.__item, s)
-+
-+	def add (self, state):
-+		self.__checkSelf ()
-+		self.__add (state)
-+
-+	cdef void __remove (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		cspi.AccessibleStateSet_remove (self.__item, s)
-+
-+	def remove (self, state):
-+		self.__checkSelf ()
-+		self.__remove (state)
-+		
-+	def __str__ (self):
-+		self.__checkSelf ()
-+		return str(self.states)
-+
-+	def __getattr__(self, name):
-+		if name == "states":
-+			result = []
-+			for state in range(SPI_STATE_INVALID, SPI_STATE_INDETERMINATE):
-+				if self.contains(state):
-+					result.append(state)
-+			return result
-+		else:
-+			raise AttributeError, name
-+
-+cdef class Relation:
-+	"""
-+	Wrapper around a cspi.AccessibleRelation
-+	"""
-+	cdef cspi.AccessibleRelation *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleRelation_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	def __str__ (self):
-+		self.__checkSelf ()
-+		return "relation %s -> %s"%(self.getRelationType (), self.getTargets())
-+
-+	def __repr__ (self):
-+		self.__checkSelf ()
-+		return "relation %s -> %s"%(self.getRelationType (), self.getTargets())
-+
-+	cdef bool __setItem (self, cspi.AccessibleRelation *obj):
-+		if self.__item != NULL:
-+			cspi.AccessibleRelation_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleRelation_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	def getNTargets (self):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getNTargets
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleRelation_getNTargets (self.__item)
-+
-+	def getTarget (self, i):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getTarget
-+		"""
-+		self.__checkSelf ()
-+		cdef Accessible target
-+		target = Accessible ()
-+		target.__setItem (cspi.AccessibleRelation_getTarget (self.__item, i))
-+		target.__checkSelf ()
-+		return target
-+
-+	def getTargets (self):
-+		"""
-+		Gets the targets of this AccessibleRelation as a list of atspi.Accessible
-+		"""
-+		self.__checkSelf ()
-+		result = []
-+		count = self.getNTargets()
-+		for i in range(count):
-+			result.append(self.getTarget(i))
-+		return result
-+
-+	def getRelationType (self):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getRelationType
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleRelation_getRelationType (self.__item)
-+
-+cdef class Accessible (Base):
-+	"""
-+	Wrapper around cspi.Accessible
-+	"""
-+	def __getattr__ (self, name):
-+		if name == "name":
-+			return self.getName ()
-+		elif name == "role":
-+			return self.getRole ()
-+		elif name == "roleName":
-+			return self.getRoleName ()
-+		elif name == "description":
-+			return self.getDescription ()
-+		elif name == "parent":
-+			return self.getParent ()
-+		elif name == "childCount":
-+			return self.getChildCount ()
-+		elif name == "indexInParent":
-+			return self.getIndexInParent ()
-+		elif name == "stateSet":
-+			return self.getStateSet ()
-+		else:
-+			raise AttributeError, name
-+
-+	def getName (self):
-+		"""
-+		Wrapper around cspi.Accessible_getName
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getName(self.__item))
-+
-+	def getDescription (self):
-+		"""
-+		Wrapper around cspi.Accessible_getDescription
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getDescription(self.__item))
-+
-+	def getParent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getParent, returning an
-+		atspi.Accessible or None
-+		"""
-+		self.__checkSelf()
-+		cdef Accessible parent
-+		cdef cspi.Accessible* spiParent
-+		
-+		spiParent = cspi.Accessible_getParent (self.__item)
-+		if spiParent!=NULL:
-+			parent = Accessible ()
-+			parent.__setItem (spiParent)
-+			parent.__checkSelf ()
-+			return parent
-+		else:
-+			return None
-+
-+	def getChildAtIndex (self, index):
-+		"""
-+		Wrapper around cspi.Accessible_getChildAtIndex, returning an
-+		atspi.Accessible, atspi.Application, or None
-+		"""
-+		self.__checkSelf()
-+		cdef int i
-+		i = index
-+		
-+		# This hairiness is due to the fact that Pyrex doesn't allow cdefs 
-+		# inside if blocks.
-+		
-+		cdef cspi.Accessible* spiChild
-+		spiChild = cspi.Accessible_getChildAtIndex (self.__item, i)
-+		# Workaround for GNOME bug #321273
-+		# http://bugzilla.gnome.org/show_bug.cgi?id=321273
-+		if spiChild == NULL: return None
-+		
-+		cdef object child
-+		cdef Application app
-+		cdef Accessible acc
-+		cdef Text text
-+		
-+		if cspi.Accessible_isApplication (spiChild):
-+			app = Application ()
-+			app.__setItem (spiChild)
-+			child = app
-+		else:
-+			acc = Accessible ()
-+			acc.__setItem (spiChild)
-+			child = acc
-+
-+		return child
-+
-+	def getIndexInParent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getIndexInParent
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getIndexInParent (self.__item)
-+
-+	def getRole (self):
-+		"""
-+		Wrapper around cspi.Accessible_getRole
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getRole (self.__item)
-+
-+	def getRoleName (self):
-+		"""
-+		Wrapper around cspi.Accessible_getRoleName
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getRoleName (self.__item))
-+
-+	def getChildCount (self):
-+		"""
-+		Wrapper around cspi.Accessible_getChildCount
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getChildCount (self.__item)
-+
-+	def getStateSet (self):
-+		"""
-+		Wrapper around cspi.Accessible_getStateSet, returning an
-+		atspi.StateSet
-+		"""
-+		self.__checkSelf()
-+		cdef StateSet set
-+		set = StateSet()
-+		set.__setItem (cspi.Accessible_getStateSet (self.__item))
-+		return set
-+
-+	def getInterface (self, interface):
-+		"""
-+		This is NOT part of cspi, it is just for compatibility with
-+		the bonobo bindings and will probably go away soon.
-+		"""
-+		self.__checkSelf()
-+		return getattr(self, "get%s" % interface) ()
-+
-+	def getAction (self):
-+		"""
-+		Wrapper around cspi.Accessible_getAction, returning
-+		an atspi.Action or None
-+		"""
-+		self.__checkSelf()
-+		cdef Action action
-+		action = Action ()
-+		action.__setItem (cspi.Accessible_getAction (self.__item))
-+		if action.__item != NULL:
-+			return action
-+
-+	def getText (self):
-+		"""
-+		Wrapper around cspi.Accessible_getText, returning an atspi.Text
-+		or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Text text
-+		text = Text ()
-+		text.__setItem (cspi.Accessible_getText (self.__item))
-+		if text.__item != NULL:
-+			return text
-+			
-+	def getEditableText (self):
-+		"""
-+		Wrapper around cspi.Accessible_getText, returning an
-+		atspi.EditableText or None
-+		"""
-+		self.__checkSelf ()
-+		cdef EditableText etext
-+		etext = EditableText ()
-+		etext.__setItem (cspi.Accessible_getEditableText (self.__item))
-+		if etext.__item != NULL:
-+			return etext
-+
-+	def getHypertext (self):
-+		"""
-+		Wrapper around cspi.Accessible_getHypertext, returning an
-+		atspi.Hypertext or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Hypertext hypertext
-+		hypertext = Hypertext ()
-+		hypertext.__setItem (cspi.Accessible_getHypertext (self.__item))
-+		if hypertext.__item != NULL:
-+			return hypertext
-+
-+	def getImage (self):
-+		"""
-+		Wrapper around cspi.Accessible_getImage, returning an
-+		atspi.Image or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Image image
-+		image = Image ()
-+		image.__setItem (cspi.Accessible_getImage (self.__item))
-+		if image.__item != NULL:
-+			return image
-+
-+	def getValue (self):
-+		"""
-+		Wrapper around cspi.Accessible_getValue, returning an
-+		atspi.Value or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Value value
-+		value = Value ()
-+		value.__setItem (cspi.Accessible_getValue (self.__item))
-+		if value.__item != NULL:
-+			return value
-+
-+	def getSelection (self):
-+		"""
-+		Wrapper around cspi.Accessible_getSelection, returning an
-+		atspi.Selection or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Selection selection
-+		selection = Selection ()
-+		selection.__setItem (cspi.Accessible_getSelection (self.__item))
-+		if selection.__item != NULL:
-+			return selection 
-+
-+	def getComponent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getComponent, returning an
-+		atspi.Component or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Component component
-+		component = Component ()
-+		component.__setItem (cspi.Accessible_getComponent (self.__item))
-+		if component.__item != NULL:
-+			return component
-+
-+	def getRelationSet (self):
-+		"""
-+		Wraps Accessible_getRelationSet, returning a list
-+		of atspi.Relation
-+		"""
-+		# looking at at-poke, result from C API appears to be a NULL-terminated list of pointers, and that we should free the buffer
-+		self.__checkSelf ()
-+		cdef Relation relation
-+
-+		relations = []
-+		cdef cspi.AccessibleRelation **relationSet
-+		relationSet = cspi.Accessible_getRelationSet (self.__item)
-+
-+		i=0
-+		while relationSet[i]:
-+			relation = Relation ()
-+			relation.__setItem (relationSet[i])
-+			relations.append(relation)
-+			i=i+1
-+		cspi.free (relationSet)
-+
-+		return relations
-+
-+
-+cdef class Desktop (Accessible):
-+	pass
-+
-+
-+cdef class Application (Accessible):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleApplication_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getToolkit (self):
-+		"""
-+		Wraps AccessibleApplication_getToolkitName, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getToolkitName (self.__item)
-+
-+	def getVersion (self):
-+		"""
-+		Wraps AccessibleApplication_getVersion, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getVersion(self.__item)
-+
-+	def getID (self):
-+		"""
-+		Wraps AccessibleApplication_getID, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getID (self.__item)
-+
-+	def pause (self):
-+		"""
-+		Wraps AccessibleApplication_pause
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_pause (self.__item)
-+
-+	def resume (self):
-+		"""
-+		Wraps AccessibleApplication_resume
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_resume (self.__item)
-+
-+cdef class Component (Accessible):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleComponent_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getExtents (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleComponent_getExtents, returning an
-+		(x,y,w,h) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y, w, h
-+		cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type)
-+		return (x, y, w, h)
-+
-+	def getPosition (self, type = 0):
-+		"""
-+		Wraps cspi.AccessibleComponent_getPosition, returning an
-+		(x,y) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y
-+		cspi.AccessibleComponent_getPosition (self.__item, &x, &y, type)
-+		return (x, y)
-+
-+	def getSize (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getSize, returning a
-+		(w,h) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long w, h
-+		cspi.AccessibleComponent_getSize (self.__item, &w, &h)
-+		return (w, h)
-+
-+	def getLayer (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getLayer, returning an 
-+		AccessibleComponentLayer.
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleComponent_getLayer (self.__item)
-+
-+	def grabFocus (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_grabFocus, raising AtspiException
-+		if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleComponent_grabFocus (self.__item):
-+			raise AtspiException("AccessibleComponent_grabFocus")
-+	
-+	def getMDIZOrder (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getMDIZOrder, returning an integer.
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleComponent_getMDIZOrder(self.__item)
-+
-+cdef class Action (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleAction_ functions,
-+	giving an OO-style API.
-+	"""
-+	def __getattr__ (self, name):
-+		if name == "nActions":
-+			return self.getNActions ()
-+		else:
-+			raise AttributeError, name
-+
-+	def getNActions (self):
-+		"""
-+		Wraps cspi.AccessibleAction_getNActions
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_getNActions (self.__item)
-+
-+	def doAction (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_doAction
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_doAction (self.__item, index)
-+
-+	def getKeyBinding (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getKeyBinding
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_getKeyBinding (self.__item, index)
-+
-+	def getName (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getName
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleAction_getName (self.__item, index))
-+
-+	def getDescription (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getDescription
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleAction_getDescription (self.__item, index))
-+
-+
-+cdef class Text (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleText_ functions,
-+	giving an OO-style API.
-+	"""
-+	def addSelection (self, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_addSelection
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_addSelection (self.__item, startOffset, endOffset):
-+			raise AtspiException("AccessibleText_addSelection")
-+			
-+
-+	#def getAttributes (self, offset, startOffset, endOffset):
-+	#	self.__checkSelf ()
-+	#	return cspi.AccessibleText_getAttributes (self.__item, offset, startOffset, endOffset)
-+	def getCaretOffset (self):
-+		"""
-+		Wraps cspi.AccessibleText_getCaretOffset
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getCaretOffset (self.__item)
-+
-+	def getCharacterCount (self):
-+		"""
-+		Wraps cspi.AccessibleText_getCharacterCount
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getCharacterCount (self.__item)
-+
-+	def getNSelections (self):
-+		"""
-+		Wraps cspi.AccessibleText_getNSelections
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getNSelections (self.__item)
-+
-+	#def getSelection (self, selectionNum, startOffset, endOffset):
-+	#	self.__checkSelf ()
-+	#	return cspi.AccessibleText_getSelection (self.__item, selectionNum, startOffset, endOffset)
-+
-+	def getText (self, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_getText
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleText_getText (self.__item, startOffset, endOffset))
-+
-+	def removeSelection (self, selectionNum):
-+		"""
-+		Wraps cspi.AccessibleText_removeSelection, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_removeSelection (self.__item, selectionNum):
-+			raise AtspiException("AccessibleText_removeSelection")
-+
-+	def setSelection (self, selectionNum, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_setSelection, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_setSelection (self.__item, selectionNum, startOffset, endOffset):
-+			raise AtspiException("AccessibleText_setSelection")
-+
-+	def setCaretOffset (self, position):
-+		"""
-+		Wraps cspi.AccessibleText_setCaretOffset, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_setCaretOffset (self.__item, position):
-+			raise AtspiException("AccessibleText_setCaretOffset")
-+
-+cdef class EditableText (Text):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleEditableText_ functions,
-+	giving an OO-style API.
-+	"""
-+	def setTextContents (self, newContents):
-+		"""
-+		Wraps cspi.AccessibleEditableText_setTextContents, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_setTextContents (self.__item, newContents):
-+			raise AtspiException("AccessibleEditableText_setTextContents")
-+
-+	def setAttributes (self, attributes, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleEditableText_setAttributes, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_setAttributes (self.__item, attributes, startOffset, endOffset):
-+			raise AtspiException("AccessibleEditableText_setAttributes")
-+
-+	def insertText (self, position, text):
-+		"""
-+		Wraps cspi.AccessibleEditableText_insertText, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_insertText (self.__item, position, text, cspi.strlen(text)):
-+			raise AtspiException("AccessibleEditableText_insertText")
-+
-+cdef class Hypertext (Text):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleHypertext_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getNLinks (self):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getNLinks, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHypertext_getNLinks (self.__item)
-+
-+	def getLink (self, linkIndex):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getLink, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		cdef Hyperlink hyperlink
-+		hyperlink = Hyperlink ()
-+		hyperlink.__setItem (cspi.AccessibleHypertext_getLink (self.__item, linkIndex))
-+		if hyperlink.__item != NULL:
-+			return hyperlink
-+
-+	def getLinkIndex (self, characterOffset):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getLinkIndex, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHypertext_getLinkIndex (self.__item, characterOffset)
-+
-+cdef class Hyperlink (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleHyperlink_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getNAnchors (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getNAnchors, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_getNAnchors (self.__item)
-+
-+	def getIndexRange (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getIndexRange, returning [startIndex, endIndex] pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long startIndex, endIndex
-+		cspi.AccessibleHyperlink_getIndexRange(self.__item, &startIndex, &endIndex)
-+		return [startIndex, endIndex]
-+
-+
-+	def getObject (self, i):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getObject
-+		"""
-+		self.__checkSelf ()
-+		cdef Accessible object
-+		object = Accessible ()
-+		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-+		object.__checkSelf ()
-+		return object
-+
-+	def getURI (self, i):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getURI, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_getURI (self.__item, i)
-+
-+	def isValid (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_isValid, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_isValid (self.__item)
-+
-+cdef class Image (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleImage_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getImageDescription (self):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleImage_getImageDescription (self.__item)
-+
-+	def getImageSize (self):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageSize, returning a (w,h) pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long w, h
-+		cspi.AccessibleImage_getImageSize(self.__item, &w, &h);
-+		return [w, h]
-+
-+	def getImagePosition (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y)
-+		pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y
-+		cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type)
-+		return [x, y]
-+
-+	def getImageExtents (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageExtents, returning a
-+		(x,y,w,h) tuple
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y, w, h
-+		cspi.AccessibleImage_getImageExtents(self.__item, &x, &y, &w, &h, type)
-+		return [x, y, w, h]
-+
-+cdef class Value (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleValue_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getMinimumValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getMinimumValue(self.__item)
-+
-+	def getCurrentValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getCurrentValue(self.__item)
-+
-+	def getMaximumValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getMaximumValue(self.__item)
-+
-+	def setCurrentValue (self, newValue):
-+		"""
-+		Wraps cspi.AccessibleValue_setCurrentValue
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleValue_setCurrentValue (self.__item, newValue):
-+			raise AtspiException("AccessibleValue_setCurrentValue")
-+
-+cdef class Selection (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleSelection_ functions,
-+	giving an OO-style API.
-+	"""
-+
-+	def getNSelectedChildren (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_getNSelectedChildren
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_getNSelectedChildren (self.__item)
-+
-+	def getSelectedChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_getSelectedChild
-+		"""
-+		self.__checkSelf ()
-+
-+		cdef cspi.Accessible* spiChild
-+		spiChild = cspi.AccessibleSelection_getSelectedChild (self.__item, index)
-+
-+		assert spiChild != NULL
-+		
-+		cdef object child
-+		cdef Application app
-+		cdef Accessible acc
-+		cdef Text text
-+		
-+		if cspi.Accessible_isApplication (spiChild):
-+			app = Application ()
-+			app.__setItem (spiChild)
-+			child = app
-+		else:
-+			acc = Accessible ()
-+			acc.__setItem (spiChild)
-+			child = acc
-+
-+		return child
-+
-+	def selectChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_selectChild
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_selectChild (self.__item, index)
-+	
-+	def deselectSelectedChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_deselectSelectedChild
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_deselectSelectedChild (self.__item, index)
-+	
-+	def isChildSelected (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_isChildSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_isChildSelected (self.__item, index)
-+
-+	def selectAll (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_selectAll
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_selectAll( self.__item)
-+
-+	def clearSelection (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_clearSelection
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_clearSelection (self.__item)
-+	
-+cdef class Table (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleTable_ functions,
-+	giving an OO-style API.
-+	"""
-+
-+	# def getTableAccessibleAt (self, row, column):
-+	# def getTableCaption (self):
-+
-+	def getTableColumnAtIndex (self, index):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnAtIndex
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnAtIndex(self.__item, index)
-+					
-+	def getTableColumnDescription (self, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnDescription(self.__item, column)
-+
-+	def getTableColumnExtentAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnExtentAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnExtentAt(self.__item, row, column)
-+
-+	# def getTableColumnHeader (self, column):
-+
-+	def getTableIndexAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getIndexAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getIndexAt(self.__item, row, column)
-+
-+	def getTableNColumns (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNColumns
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNColumns(self.__item)
-+
-+	def getTableNRows (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNRows
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNRows(self.__item)
-+
-+	def getTableNSelectedColumns (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNSelectedColumns
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNSelectedColumns(self.__item)
-+
-+	def getTableNSelectedRows (self):
-+		"""
-+x		Wraps cspi.AccessibleTable_getNSelectedRows
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNSelectedRows(self.__item)
-+
-+	def getTableRowAtIndex (self, index):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowAtIndex
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowAtIndex(self.__item, index)
-+
-+	def getTableRowDescription (self, row):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowDescription(self.__item, row)
-+
-+	def getTableRowExtentAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowExtentAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowExtentAt(self.__item, row, column)
-+
-+	# def getTableRowHeader (self, row):
-+ 	# def getTableSelectedRows (self, **selectedRows): - Not sure if the variable which is a pointer to a pointer is acceptable
-+	# def getTableSelectedColumns (self, **selectedColumns): - Same issue as above
-+	# def getTableSummary (self):
-+
-+	def isTableColumnSelected (self, column):
-+		"""
-+		Wraps cspi.AccessibleTable_isColumnSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isColumnSelected(self.__item, column)
-+
-+	def isTableRowSelected (self, row):
-+		"""
-+		Wraps cspi.AccessibleTable_isRowSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isRowSelected(self.__item, row)
-+
-+	def isTableSelected (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_isSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isSelected(self.__item, row, column)
-+
-+
-+cdef class Event (EventBase):
-+	#def AccessibleEventListener* SPI_createAccessibleEventListener (AccessibleEventListenerCB callback, void *user_data)
-+	#void AccessibleEventListener_unref (AccessibleEventListener *listener)
-+	#SPIBoolean AccessibleEventListener_addCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback, void *user_data)
-+	#SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback)
-+
-+	#Accessible* AccessibleActiveDescendantChangedEvent_getActiveDescendant (AccessibleEvent *event)
-+	#Accessible* AccessibleChildChangedEvent_getChildAccessible (AccessibleEvent *event)
-+	
-+	def getDescriptionChangedEventDescriptionString (self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleDescriptionChangedEvent_getDescriptionString(self.__item))
-+
-+	def getNameChangedEventNameString (self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleNameChangedEvent_getNameString(self.__item))
-+
-+	# Accessible* AccessibleParentChangedEvent_getParentAccessible (AccessibleEvent *event)
-+
-+	def getTableCaptionChangedEventCaptionString(self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleTableCaptionChangedEvent_getCaptionString(self.__item))
-+
-+	def getTableColumnDescriptionChangedEventDescriptionString(self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTableColumnDescriptionChangedEvent_getDescriptionString(self.__item))
-+
-+	# Accessible* AccessibleTableHeaderChangedEvent_getHeaderAccessible (AccessibleEvent *event)
-+
-+	def getTableRowDescriptionChangedEventDescriptionString(self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTableRowDescriptionChangedEvent_getDescriptionString(self.__item))
-+	
-+	#Accessible* AccessibleTableSummaryChangedEvent_getSummaryAccessible (AccessibleEvent *event)
-+
-+	def getTextChangedEventChangeString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTextChangedEvent_getChangeString(self.__item))
-+
-+	def getTextSelectionChangedEventSelectionString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTextSelectionChangedEvent_getSelectionString(self.__item))
-+
-+	def getWindowEventTitleString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleWindowEvent_getTitleString(self.__item))
-+
-+class EventGenerator:
-+	"""
-+	Wrapper layer around SPI_generateKeyboardEvent and
-+	SPI_generateMouseEvent, used for generating input events.
-+
-+	Use AccessibleAction in preference to this.
-+	"""
-+	def injectKeyboardString (self, string):
-+		"""
-+		Inject a string as if it had been typed using an input method.
-+		"""
-+		# Seems to only work if you do it one character at a time...
-+		for char in string:
-+			self.__generateKeystringEvent (str(char), cspi.SPI_KEY_STRING)
-+
-+	def __keyStringToKeyCode(self, keyString):
-+		cdef Xlib.Display *display
-+		display = Xlib.XOpenDisplay(NULL)
-+
-+		cdef Xlib.KeySym sym
-+		sym = Xlib.XStringToKeysym(keyString)
-+		cdef Xlib.KeyCode code
-+		code = Xlib.XKeysymToKeycode(display, sym)
-+
-+		#print str(keyString), str(int(sym)), code
-+
-+		Xlib.XCloseDisplay(display)
-+		return int(code)
-+	
-+	def generateKeyCombo (self, keyStrings):
-+		modifiers = keyStrings[:-1]
-+		finalKey = keyStrings[-1]
-+
-+		for modifier in modifiers:
-+			code = self.__keyStringToKeyCode(modifier)
-+			self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESS)
-+
-+		code = self.__keyStringToKeyCode(finalKey)
-+		self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESSRELEASE)
-+
-+		for modifier in modifiers:
-+			code = self.__keyStringToKeyCode(modifier)
-+			self.generateKeyboardEvent(code, '', cspi.SPI_KEY_RELEASE)
-+
-+		
-+	def __generateKeyvalEvent (self, keyval, synthType):
-+		self.generateKeyboardEvent (keyval, None, synthType)
-+
-+	def __generateKeystringEvent (self, keystring, synthType):
-+		self.generateKeyboardEvent (0, keystring, synthType)
-+	
-+	def generateKeyboardEvent (self, keyval, keystring, synthType):
-+		if not cspi.SPI_generateKeyboardEvent (keyval, keystring, synthType):
-+			raise AtspiException("SPI_generateKeyboardEvent")
-+
-+	def click (self, x, y, button):
-+		"""
-+		Synthesize a mouse button click at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "c")
-+
-+	def doubleClick (self, x, y, button):
-+		"""
-+		Synthesize a mouse button double-click at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "d")
-+
-+	def press (self, x, y, button):
-+		"""
-+		Synthesize a mouse button press at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "p")
-+
-+	def release (self, x, y, button):
-+		"""
-+		Synthesize a mouse button release at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "r")
-+
-+	def absoluteMotion (self, x, y):
-+		"""
-+		Synthesize mouse absolute motion to (x,y)
-+		"""
-+		self.__generateEvent (x, y, "abs")
-+
-+	def relativeMotion (self, x, y):
-+		"""
-+		Synthesize mouse relative motion of (x,y)
-+		"""
-+		self.__generateEvent (x, y, "rel")
-+
-+	def drag (self, fromXY, toXY, button):
-+		"""
-+		Synthesize a drag (press, move and release) from (x,y) to (x,y).
-+
-+		These are absolute screen coordinates
-+		"""
-+		(x,y) = fromXY
-+		self.press (x, y, button)
-+
-+		(x,y) = toXY
-+		self.absoluteMotion(x,y)
-+
-+		self.release (x, y, button)
-+
-+	def __generateEvent (self, x, y, name):
-+		"""
-+		Thin wrapper around SPI_generateMouseEvent.
-+
-+		Event names: b1p = button 1 press; b2r = button 2 release;
-+		b3c = button 3 click; b2d = button 2 double-click;
-+		abs = absolute motion; rel = relative motion.
-+		"""
-+		if not cspi.SPI_generateMouseEvent (x, y, name):
-+			raise AtspiException("Error generating mouse event")
-+
-+	def __generateButtonEvent (self, x, y, button, suffix):
-+		self.__generateEvent (x, y, self.__generateButtonName(button)+suffix)
-+
-+	def __generateButtonName(self, button):
-+		if button==1:
-+			return "b1"
-+		elif button==2:
-+			return "b2"
-+		elif button==3:
-+			return "b3"
-+		else: raise ValueError, "Unknown button"
-+
-+# We use this C function to marshal a call to a python function.  The Python callback
-+# function is installed as the userdata of this C callback function.  See the
-+# "cheesefinder" demo in the Pyrex sources.
-+# We ignore the "const"ness of the AccessibleEvent
-+cdef void marshalAccessibleEventCallback (cspi.AccessibleEvent *event, void *python_fn) except *:
-+	e = Event()
-+	EventBase.__setItem(e, event)
-+	(<object>python_fn) (e)
-+
-+cdef class EventListener:
-+	"""
-+	Wrapper around the low-level cspi.AccessibleEventListener_ functions,
-+	giving an OO-style API.
-+	"""
-+	cdef cspi.AccessibleEventListener *__item
-+	cdef public object eventTypes
-+
-+	def __init__ (self, callback, eventTypes):
-+		"""
-+		Registers a python callback function to be called.
-+		The callback is expected to have one input, of type atspi.Event, and no return value.
-+		See documentation of SPI_registerGlobalEventListener for the event names
-+		"""
-+		self.eventTypes = eventTypes
-+		self.__item = cspi.SPI_createAccessibleEventListener (marshalAccessibleEventCallback, <void*>callback)
-+		for eventType in self.eventTypes:
-+			#char *e
-+			e = eventType
-+			if not cspi.SPI_registerGlobalEventListener (self.__item, e):
-+				raise AtspiException("Unable to register event listener")
-+
-+	def deregister(self):
-+		for eventType in self.eventTypes:
-+			cspi.SPI_deregisterGlobalEventListener(self.__item, eventType)
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			self.deregister()
-+			cspi.AccessibleEventListener_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+cdef class DeviceEvent:
-+	"""
-+	Wrapper around a cspi.AccessibleDeviceEvent
-+	"""
-+	cdef cspi.AccessibleDeviceEvent *__item
-+	cdef public object keyID
-+	cdef public object keyCode
-+	cdef public object keyString
-+	cdef public object timeStamp
-+	cdef public object type
-+	cdef public object modifiers
-+	cdef public object isText
-+
-+	def __new__ (self):
-+			self.__item = NULL
-+
-+	cdef bool __setItem (self, cspi.AccessibleDeviceEvent *obj):
-+			if obj != NULL:
-+					self.__item = obj
-+					self.keyID = self.__item.keyID
-+					self.keyCode = self.__item.keycode
-+					self.keyString = self.__item.keystring
-+					self.timeStamp = self.__item.timestamp
-+					self.type = self.__item.type
-+					self.modifiers = self.__item.modifiers
-+					if self.__item.is_text: self.isText = True
-+					else: self.isText = False
-+					return True
-+			else:
-+					return False
-+
-+	def __checkSelf (self):
-+			if self.__item == NULL:
-+					raise AttributeError, "__item must not be NULL"
-+
-+#	def __dealloc__ (self):
-+#			if self.__item != NULL:
-+#					cspi.AccessibleDeviceEvent_unref (self.__item)
-+
-+
-+cdef cspi.SPIBoolean marshalAccessibleDeviceEventCallback (cspi.AccessibleDeviceEvent *event, void *python_fn) except 1:
-+	k = DeviceEvent()
-+	#k.__setItem(event)
-+	DeviceEvent.__setItem(k, event)
-+	k.__checkSelf()
-+	(<object>python_fn) (k)
-+	return False
-+
-+cdef class DeviceListener:
-+	"""
-+	Wrapper around the low-level cspi.AccessibleDeviceListener_ functions,
-+	giving an OO-style API.
-+	"""
-+	cdef cspi.AccessibleDeviceListener *__item
-+	cdef public object modMasks
-+
-+	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
-+		"""
-+		Registers a python callback function to be called.
-+
-+		eventMask may be one of the following:
-+        key pressed: 1
-+		key released: 2
-+		key pressed or released (default): 3
-+		"""
-+		self.__item = cspi.SPI_createAccessibleDeviceListener (marshalAccessibleDeviceEventCallback, <void*>callback)
-+		cdef cspi.AccessibleKeySet *keySet
-+		keySet = SPI_KEYSET_ALL_KEYS
-+		self.modMasks = []
-+		cdef short int modMask
-+		syncType = SPI_KEYLISTENER_SYNCHRONOUS | SPI_KEYLISTENER_CANCONSUME
-+		#syncType = SPI_KEYLISTENER_NOSYNC
-+		for modMask from 0 <= modMask < (1 << 8):
-+			self.modMasks.append(modMask)
-+			desc = "keySet "+str(<int> keySet)+" modMask "+str(modMask)+" eventMask "+str(eventMask)+" syncType "+str(syncType)
-+			desc = str(desc)
-+			if not cspi.SPI_registerAccessibleKeystrokeListener (self.__item, keySet, modMask, eventMask, syncType):
-+				raise AtspiException("Unable to register keystroke listener", desc)
-+
-+	def deregister(self):
-+		if self.__item != NULL:
-+			for modMask in self.modMasks:
-+				cspi.SPI_deregisterAccessibleKeystrokeListener(self.__item, modMask)
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			self.deregister()
-+			cspi.AccessibleDeviceListener_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+
-+# vim: sw=4 ts=4 sts=4 noet ai
diff --git a/testing/python-pysqlite/PKGBUILD b/testing/python-pysqlite/PKGBUILD
deleted file mode 100644
index 5e889eab9..000000000
--- a/testing/python-pysqlite/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 168875 2012-10-16 11:55:25Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=python-pysqlite
-pkgname=python2-pysqlite
-pkgver=2.6.3
-pkgrel=3
-pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pysqlite/"
-depends=('python2' 'sqlite')
-conflicts=('python-pysqlite<=2.6.3-2')
-replaces=('python-pysqlite<=2.6.3-2')
-source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
-        setup.cfg)
-md5sums=('711afa1062a1d2c4a67acdf02a33d86e'
-         '86dd356c65afd14a22f2f8f64a26441e')
-
-check() {
-    cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/
-    python2 -c "from pysqlite2 import test; test.test()"
-}
-
-build() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	cp "${srcdir}/setup.cfg" .
-	python2 setup.py build
-}
-
-package_python2-pysqlite() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	rm -r "${pkgdir}/usr/pysqlite2-doc"
-}
diff --git a/testing/python-pysqlite/setup.cfg b/testing/python-pysqlite/setup.cfg
deleted file mode 100644
index ba6c77075..000000000
--- a/testing/python-pysqlite/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[build_ext]
-define=
-include_dirs=/usr/include
-library_dirs=/usr/lib
-libraries=sqlite3
diff --git a/testing/python-urwid/PKGBUILD b/testing/python-urwid/PKGBUILD
deleted file mode 100644
index d1804969c..000000000
--- a/testing/python-urwid/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.2
-pkgrel=2
-pkgdesc="Urwid is a curses-based user interface library."
-license=('LGPL')
-arch=('i686' 'x86_64')
-makedepends=('python2-distribute' 'python-distribute')
-url="http://excess.org/urwid/"
-source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('00542bbd15fae7ea60b02a7570edee2b')
-
-build() {
-  cp -r urwid-$pkgver python2-urwid-$pkgver
-
-  cd "$srcdir/urwid-$pkgver"
-  python setup.py build
-
-  cd "$srcdir/python2-urwid-$pkgver"
-  sed -i 's#bin/python#bin/python2#' urwid/*.py
-  
-  python2 setup.py build
-}
-
-package_python-urwid() {
-  depends=('python')
-
-  cd "$srcdir/urwid-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
-package_python2-urwid() {
-  depends=('python2')
- 
-  cd "$srcdir/python2-urwid-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
diff --git a/testing/python-wpactrl/PKGBUILD b/testing/python-wpactrl/PKGBUILD
deleted file mode 100644
index ea380a61a..000000000
--- a/testing/python-wpactrl/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168879 2012-10-16 11:55:34Z allan $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgbase=python-wpactrl
-pkgname=python2-wpactrl
-pkgver=20090609
-pkgrel=4
-pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access"
-arch=('i686' 'x86_64')
-url="http://projects.otaku42.de/wiki/PythonWpaCtrl"
-license=('GPL2')
-depends=('python2')
-conflicts=('python-wpactrl<=20090609-3')
-replaces=('python-wpactrl<=20090609-3')
-source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz)
-md5sums=('8d45739aa9bfa1110a4570bb5ceda768')
-
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	python2 setup.py build
-}
-
-package_python2-wpactrl() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/testing/python/PKGBUILD b/testing/python/PKGBUILD
deleted file mode 100644
index f35fd3cd5..000000000
--- a/testing/python/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 168851 2012-10-16 11:54:17Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=python
-pkgver=3.3.0
-pkgrel=1
-_pybasever=3.3
-pkgdesc="Next generation of the python high-level scripting language"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.python.org/"
-depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk' 'sqlite' 'valgrind')
-optdepends=('tk: for tkinter' 'sqlite')
-provides=('python3')
-replaces=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a')
-
-build() {
-  cd "${srcdir}/Python-${pkgver}"
-
-  # FS#23997
-  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  ./configure --prefix=/usr \
-              --enable-shared \
-              --with-threads \
-              --with-computed-gotos \
-              --enable-ipv6 \
-              --with-valgrind \
-              --with-system-expat \
-              --with-dbmliborder=gdbm:ndbm \
-              --with-system-ffi
-
-  make
-}
-
-check() {
-  cd "${srcdir}/Python-${pkgver}"
-  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \
-     test_urllib test_uuid test_pydoc
-}
-
-package() {
-  cd "${srcdir}/Python-${pkgver}"
-  make DESTDIR="${pkgdir}" install maninstall
-
-  # Why are these not done by default...
-  ln -sf python3               "${pkgdir}/usr/bin/python"
-  ln -sf python3-config        "${pkgdir}/usr/bin/python-config"
-  ln -sf idle3                 "${pkgdir}/usr/bin/idle"
-  ln -sf pydoc3                "${pkgdir}/usr/bin/pydoc"
-  ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
-
-  # Fix FS#22552
-  ln -sf ../../libpython${_pybasever}m.so \
-    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so"
-
-  # Clean-up reference to build directory
-  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile"
-
-  # License
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/qjackctl/PKGBUILD b/testing/qjackctl/PKGBUILD
deleted file mode 100644
index 0884a6587..000000000
--- a/testing/qjackctl/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163957 2012-07-22 18:36:11Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=qjackctl
-pkgver=0.3.9
-pkgrel=2
-pkgdesc="A Qt front-end for the JACK low-latency audio server"
-url="http://qjackctl.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('jack' 'qt')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('f932c916f43ba3251d3a9ed62a448e43')
-
-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/qpdf/PKGBUILD b/testing/qpdf/PKGBUILD
deleted file mode 100644
index 6b7ab96cd..000000000
--- a/testing/qpdf/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 165886 2012-09-02 20:15:26Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Miguel Revilla <yo at miguelrevilla.com>
-# Contributor: David Sotelo <dvsotelo at gmail.com>
-# Contributor: Nuno Araujo <nuno.araujo@russo79.com>
-
-pkgname=qpdf
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
-arch=('i686' 'x86_64')
-url="http://qpdf.sourceforge.net/"
-license=('custom:Artistic-2.0')
-depends=('pcre' 'perl')
-makedepends=('make')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('48767e2519029d0214cd0fcafa3a8f8c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix rpath errors (from Fedora spec)
-  autoreconf -vfi
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" install
-
-  mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 Artistic-2.0 ${pkgdir}/usr/share/licenses/${pkgname}/
-}
diff --git a/testing/qscintilla/PKGBUILD b/testing/qscintilla/PKGBUILD
deleted file mode 100644
index d43b5e295..000000000
--- a/testing/qscintilla/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 168881 2012-10-16 11:55:38Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
-         'python-qscintilla-common')
-pkgver=2.6.2
-pkgrel=3
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'pyqt' 'chrpath')
-source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
-        'configure.py-objdir-support.diff')
-md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
-         '8cf9c06252e2f11ab00e62848e322fd3')
-
-build() {
-    cd "${srcdir}/QScintilla-gpl-${pkgver}" 
-    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-
-    cd Qt4Qt5
-    qmake qscintilla.pro
-    make
-    
-    cd ../designer-Qt4
-    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
-    make
-
-    cd ../
-    cp -rf Python Python2
-    cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
-    make
-
-    cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
-    make    
-}
-
-package_qscintilla() {
-    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
-    depends=('qscintilla')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-      
-    # Provided by python-qscintilla
-    rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
-}
-
-package_python-qscintilla() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'pyqt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
-    install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
-}
-
-package_python2-qscintilla() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python2-pyqt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
-    install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
-}
diff --git a/testing/qscintilla/configure.py-objdir-support.diff b/testing/qscintilla/configure.py-objdir-support.diff
deleted file mode 100644
index b595de18c..000000000
--- a/testing/qscintilla/configure.py-objdir-support.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
-@DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
- import glob
- import optparse
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
- 
- # Import SIP's configuration module so that we have access to the error
- # reporting.  Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
-     if os.access(sciglobal, os.F_OK):
-         # Get the QScintilla version string.
-         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+        return # Debian: do not check for the installed version, we're good this way.
-         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
-             # Because we include the Python bindings with the C++ code we can
-             # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
-     argv.append(buildfile)
- 
-     if pyqt.pyqt_version >= 0x040000:
--        argv.append("sip/qscimod4.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
-     else:
--        argv.append("sip/qscimod3.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
- 
-     os.system(" ".join(argv))
- 
diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD
deleted file mode 100644
index b7a869a92..000000000
--- a/testing/qt/PKGBUILD
+++ /dev/null
@@ -1,137 +0,0 @@
-# $Id: PKGBUILD 166748 2012-09-17 16:06:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
-    'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-    'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
-    'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'improve-cups-support.patch'
-        'fix-crash-in-assistant.patch')
-md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
-         'fc211414130ab2764132e7370f8e5caa'
-         '85179f5e0437514f8639957e1d8baf62'
-         'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'c439c7731c25387352d8453ca7574971'
-         '57590084078b6379f0501f7728b02ae2')
-
-build() {
-  cd "${srcdir}"/${_pkgfqn}
-
-  # (FS#28381) (KDEBUG#180051)
-  patch -p1 -i "${srcdir}"/improve-cups-support.patch
-
-  # (FS#)
-  patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
-  
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
-  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
-  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
-  ./configure -confirm-license -opensource \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt \
-    -plugindir /usr/lib/qt/plugins \
-    -importdir /usr/lib/qt/imports \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc/xdg \
-    -examplesdir /usr/share/doc/qt/examples \
-    -demosdir /usr/share/doc/qt/demos \
-    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-    -system-sqlite \
-    -no-phonon \
-    -no-phonon-backend \
-    -no-webkit \
-    -graphicssystem raster \
-    -openssl-linked \
-    -nomake demos \
-    -nomake examples \
-    -nomake docs \
-    -silent \
-    -no-rpath \
-    -optimized-qmake \
-    -reduce-relocations \
-    -dbus-linked \
-    -no-openvg
-  make
-}
-
-package_qt() {
-    pkgdesc='A cross-platform application and UI framework'
-    depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
-      'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-      'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-    optdepends=('postgresql-libs: PostgreSQL driver'
-                'libmysqlclient: MySQL driver'
-                'unixodbc: ODBC driver'
-                'libfbclient: Firebird/iBase driver'
-                'libxinerama: Xinerama support'
-                'libxcursor: Xcursor support'
-                'libxfixes: Xfixes support')
-    install='qt.install'
-
-    cd "${srcdir}"/${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    # install missing icons and desktop files
-    for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-      size=$(echo $(basename ${icon}) | cut -d- -f2)
-      install -p -D -m644 ${icon} \
-        "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
-    done
-    install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
-      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
-    install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
-      "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
-    install -p -D -m644 tools/designer/src/designer/images/designer.png \
-      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
-    install -d "${pkgdir}/usr/share/applications"
-    install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
-      "${pkgdir}/usr/share/applications/"
-
-    # install license addition
-    install -D -m644 LGPL_EXCEPTION.txt \
-      ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
-    # Fix wrong path in pkgconfig files
-    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
-      -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
-    # Fix wrong path in prl files
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
-    pkgdesc="Qt private headers for development"
-    depends=("qt=${pkgver}")
-
-    install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
-    install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-    
-    for i in QtCore QtDeclarative QtGui QtScript; do
-      cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
-        "${pkgdir}"/usr/include/${i}/
-    done
-
-    for i in corelib declarative gui script; do
-      cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
-    done
-}
diff --git a/testing/qt/assistant.desktop b/testing/qt/assistant.desktop
deleted file mode 100644
index a9e98c44b..000000000
--- a/testing/qt/assistant.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/testing/qt/designer.desktop b/testing/qt/designer.desktop
deleted file mode 100644
index 9b7b6e9aa..000000000
--- a/testing/qt/designer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/testing/qt/fix-crash-in-assistant.patch b/testing/qt/fix-crash-in-assistant.patch
deleted file mode 100644
index 4246e0532..000000000
--- a/testing/qt/fix-crash-in-assistant.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp	2012-06-26 17:37:47.334536023 +0000
-+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~	2012-06-26 17:37:08.531487286 +0000
-@@ -944,8 +944,7 @@
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
-
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
diff --git a/testing/qt/improve-cups-support.patch b/testing/qt/improve-cups-support.patch
deleted file mode 100644
index e0305e11b..000000000
--- a/testing/qt/improve-cups-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
-     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+    if (cups) {
-+        const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                options.duplexShort->setChecked(true);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                options.duplexLong->setChecked(true);
-+            else
-+                options.noDuplex->setChecked(true);
-+        }
-+
-+        if (cups->currentPPD()) {
-+            // set default color
-+            if (cups->currentPPD()->color_device)
-+                options.color->setChecked(true);
-+            else
-+                options.grayscale->setChecked(true);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups->ppdOption("Collate");
-+        if (collate)
-+            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+    }
- }
- #endif
- 
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
-                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
-         setOutputFormat(QPrinter::PdfFormat);
-     }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+    // fill in defaults from ppd file
-+    QCUPSSupport cups;
-+
-+    int printernum = -1;
-+    for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+            printernum = i;
-+    }
-+    if (printernum >= 0) {
-+        cups.setCurrentPrinter(printernum);
-+
-+        const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                setDuplex(DuplexShortSide);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                setDuplex(DuplexLongSide);
-+            else
-+                setDuplex(DuplexNone);
-+        }
-+
-+        if (cups.currentPPD()) {
-+            // set default color
-+            if (cups.currentPPD()->color_device)
-+                setColorMode(Color);
-+            else
-+                setColorMode(GrayScale);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups.ppdOption("Collate");
-+        if (collate)
-+            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+    }
-+#endif
- }
- 
- /*!
diff --git a/testing/qt/linguist.desktop b/testing/qt/linguist.desktop
deleted file mode 100644
index 8cbe86599..000000000
--- a/testing/qt/linguist.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/testing/qt/qt.install b/testing/qt/qt.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/qt/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/qt/qtconfig.desktop b/testing/qt/qtconfig.desktop
deleted file mode 100644
index 46dcf9e3d..000000000
--- a/testing/qt/qtconfig.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config 
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/testing/qt3/PKGBUILD b/testing/qt3/PKGBUILD
deleted file mode 100644
index 969cb6aba..000000000
--- a/testing/qt3/PKGBUILD
+++ /dev/null
@@ -1,124 +0,0 @@
-# $Id: PKGBUILD 168290 2012-10-07 22:25:27Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=qt3
-pkgver=3.3.8b
-pkgrel=2
-epoch=1
-pkgdesc="The QT3 gui toolkit"
-arch=('i686' 'x86_64')
-url="http://www.trolltech.com/products/qt/index.html"
-license=('GPL')
-depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft'
-         'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-options=('!libtool')
-install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz
-        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
-        eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
-sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
-          'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
-          '3d19510c46016a1a211d97bf8f82b01498b1b33c'
-          '33418e5b117458af23c72cdbffc0c339bc34bdc4'
-          '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
-          '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
-          '1346320614f6f86fbeb10b9fbad721dea29f5b61'
-          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
-
-# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
-# other qt-patches come from fedora and gentoo
-
-build() {
-  unset QMAKESPEC
-  export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
-  export PATH=${QTDIR}/bin:${PATH}
-  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
-  export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # apply qt patches from kde.org
-  for i in ../qt-copy-kde-patches/*; do
-    patch -p0 -i $i 
-  done
-  # apply other qt patches and one security fix from debian/gentoo
-  for i in ../qt-patches/*; do
-    patch -p1 -i $i 
-  done
-  # fix CJK font/chars select error (FS#11245)
-  patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff 
-  # fix build problem against new unixODBC
-  patch -p1 -i "${srcdir}"/qt-odbc.patch 
-  # fix build with gcc 4.6.0
-  patch -p1 -i "${srcdir}"/gcc-4.6.patch
-
-  patch -p0 -i "${srcdir}"/qt3-png15.patch 
-  # start compiling qt
-  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-  rm -rf doc/html examples tutorial
-  sed -i "s|sub-tutorial sub-examples||" Makefile
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
-  sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
-  sed -i "s|read acceptance|acceptance=yes|" configure
-
- # remove unwanted mkspecs
-  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
-  if [ "$CARCH" = "x86_64" ]; then
-      export ARCH="-64"	
-    else unset ARCH
-  fi
-
-  ./configure -prefix /opt/qt \
-    -platform linux-g++$ARCH \
-    -system-zlib \
-    -qt-gif \
-    -release \
-    -shared \
-    -sm \
-    -nis \
-    -thread \
-    -stl \
-    -system-lib{png,jpeg,mng} \
-    -no-g++-exceptions \
-    -plugin-sql-{mysql,psql,sqlite,odbc}
-
-  # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make -C qmake 
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # fix the broken makefiles
-  #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make INSTALL_ROOT="${pkgdir}" install
-  rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
-  sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
-  install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
-  install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
-  ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
-  rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
-
-  # install man pages
-  install -d -m755 "${pkgdir}"/opt/qt/man
-  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
-
-  install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-  echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
-}
diff --git a/testing/qt3/eastern_asian_languagues.diff b/testing/qt3/eastern_asian_languagues.diff
deleted file mode 100644
index 7c25eef7d..000000000
--- a/testing/qt3/eastern_asian_languagues.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-01-15 21:09:13.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-03-10 11:34:22.000000000 +0200
-@@ -966,20 +966,22 @@
- 
- #ifdef Q_WS_X11
-     if (script == QFont::Han) {
--	// modify script according to locale
--	static QFont::Script defaultHan = QFont::UnknownScript;
--	if (defaultHan == QFont::UnknownScript) {
--	    QCString locale = setlocale(LC_ALL, NULL);
--	    if (locale.contains("ko"))
--		defaultHan = QFont::Han_Korean;
--	    else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
--		defaultHan = QFont::Han_TraditionalChinese;
--	    else if (locale.contains("zh"))
--		defaultHan = QFont::Han_SimplifiedChinese;
--	    else
--		defaultHan = QFont::Han_Japanese;
--	}
--	script = defaultHan;
-+        // modify script according to locale
-+        static QFont::Script defaultHan;
-+        QCString locale = setlocale(LC_ALL, NULL);
-+
-+        if (locale.contains("ko"))
-+            defaultHan = QFont::Han_Korean;
-+        else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-+            defaultHan = QFont::Han_TraditionalChinese;
-+        else if (locale.contains("zh"))
-+            defaultHan = QFont::Han_SimplifiedChinese;
-+        else if (locale.contains("ja"))
-+            defaultHan = QFont::Han_Japanese;
-+        else
-+            defaultHan = QFont::Han; // don't change
-+
-+        script = defaultHan;
-     }
- #endif
- 
diff --git a/testing/qt3/gcc-4.6.patch b/testing/qt3/gcc-4.6.patch
deleted file mode 100644
index bcbffcea6..000000000
--- a/testing/qt3/gcc-4.6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h
---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-01-30 21:14:29.275088725 -0600
-@@ -49,6 +49,7 @@
- #include "qvaluelist.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <map>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h
---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-01-30 21:14:01.765846592 -0600
-@@ -47,6 +47,7 @@
- #include "qdatastream.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <list>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h
---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-01-30 21:14:01.765846592 -0600
-@@ -45,6 +45,7 @@
- #include "qdatastream.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <vector>
- #endif
diff --git a/testing/qt3/qt-copy-kde-patches.tar.bz2 b/testing/qt3/qt-copy-kde-patches.tar.bz2
deleted file mode 100644
index 519f7173a..000000000
--- a/testing/qt3/qt-copy-kde-patches.tar.bz2
+++ /dev/null
diff --git a/testing/qt3/qt-odbc.patch b/testing/qt3/qt-odbc.patch
deleted file mode 100644
index 6f21e3cf1..000000000
--- a/testing/qt3/qt-odbc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
-+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
-@@ -57,13 +57,13 @@
- #endif
- 
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
- 
--#ifdef SQLULEN
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER
diff --git a/testing/qt3/qt-patches.tar.bz2 b/testing/qt3/qt-patches.tar.bz2
deleted file mode 100644
index 3f4aee171..000000000
--- a/testing/qt3/qt-patches.tar.bz2
+++ /dev/null
diff --git a/testing/qt3/qt.install b/testing/qt3/qt.install
deleted file mode 100644
index 6d042daae..000000000
--- a/testing/qt3/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
-}
diff --git a/testing/qt3/qt.profile b/testing/qt3/qt.profile
deleted file mode 100644
index ed4d232ae..000000000
--- a/testing/qt3/qt.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export QTDIR=/opt/qt
-export QT_XFT=true
-export PATH=$PATH:$QTDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/testing/qt3/qt3-png15.patch b/testing/qt3/qt3-png15.patch
deleted file mode 100644
index e64fea36a..000000000
--- a/testing/qt3/qt3-png15.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $
-
---- src/kernel/qpngio.cpp.orig	2007-02-02 10:01:15.000000000 -0400
-+++ src/kernel/qpngio.cpp
-@@ -43,6 +43,7 @@
- #include "qiodevice.h"
- 
- #include <png.h>
-+#include <zlib.h>
- 
- 
- #ifdef Q_OS_TEMP
-@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct
-     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 	0, 0, 0);
- 
-+    png_colorp info_ptr_palette = NULL;
-+    int info_ptr_num_palette = 0;
-+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
-+    }
-+
-+    png_bytep info_ptr_trans_alpha = NULL;
-+    int info_ptr_num_trans = 0;
-+    png_color_16p info_ptr_trans_color = NULL;
-+
-+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-+	png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
-+    }
-+
-+
-     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
- 	// Black & White or 8-bit grayscale
--	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
-+	if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
- 	    png_set_invert_mono( png_ptr );
- 	    png_read_update_info( png_ptr, info_ptr );
- 	    if (!image.create( width, height, 1, 2, QImage::BigEndian ))
-@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr_trans_color->gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct
- 	}
-     } else if ( color_type == PNG_COLOR_TYPE_PALETTE
-      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
--     && info_ptr->num_palette <= 256 )
-+     && info_ptr_num_palette <= 256 )
-     {
- 	// 1-bit and 8-bit color
- 	if ( bit_depth != 1 )
-@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct
- 	png_read_update_info( png_ptr, info_ptr );
- 	png_get_IHDR(png_ptr, info_ptr,
- 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
--	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
-+	if (!image.create(width, height, bit_depth, info_ptr_num_palette,
- 	    QImage::BigEndian))
- 	    return;
- 	int i = 0;
- 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- 	    image.setAlphaBuffer( TRUE );
--	    while ( i < info_ptr->num_trans ) {
-+	    while ( i < info_ptr_num_trans ) {
- 		image.setColor(i, qRgba(
--		    info_ptr->palette[i].red,
--		    info_ptr->palette[i].green,
--		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr_palette[i].red,
-+		    info_ptr_palette[i].green,
-+		    info_ptr_palette[i].blue,
-+		    info_ptr_trans_alpha[i]
- 		    )
- 		);
- 		i++;
- 	    }
- 	}
--	while ( i < info_ptr->num_palette ) {
-+	while ( i < info_ptr_num_palette ) {
- 	    image.setColor(i, qRgba(
--		info_ptr->palette[i].red,
--		info_ptr->palette[i].green,
--		info_ptr->palette[i].blue,
-+		info_ptr_palette[i].red,
-+		info_ptr_palette[i].green,
-+		info_ptr_palette[i].blue,
- 		0xff
- 		)
- 	    );
-@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio)
- 	return;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	iio->setStatus(-4);
- 	return;
-@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q
- 	return FALSE;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	return FALSE;
-     }
-@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q
- 
-     png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
- 
-+#warning XXXtnn not too sure about this
-+/* 
-+according to png.h, channels is only used on read, not writes, so we
-+should be able to comment this out.
-+
-     info_ptr->channels =
- 	(image.depth() == 32)
- 	    ? (image.hasAlphaBuffer() ? 4 : 3)
- 	    : 1;
-+*/
- 
-     png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
- 	image.depth() == 1 ? 1 : 8 /* per channel */,
-@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q
- 		: PNG_COLOR_TYPE_RGB
- 	    : PNG_COLOR_TYPE_PALETTE, 0, 0, 0);
- 
-+    png_color_8 sig_bit;
-+    sig_bit.red = 8;
-+    sig_bit.green = 8;
-+    sig_bit.blue = 8;
-+    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- 
--    //png_set_sBIT(png_ptr, info_ptr, 8);
--    info_ptr->sig_bit.red = 8;
--    info_ptr->sig_bit.green = 8;
--    info_ptr->sig_bit.blue = 8;
- 
-     if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian)
-        png_set_packswap(png_ptr);
-@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q
- 	png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
- 	int* trans = new int[num_palette];
- 	int num_trans = 0;
-+	png_colorp info_ptr_palette = NULL;
-+	int tmp;
-+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
- 	for (int i=0; i<num_palette; i++) {
- 	    QRgb rgb=image.color(i);
--	    info_ptr->palette[i].red = qRed(rgb);
--	    info_ptr->palette[i].green = qGreen(rgb);
--	    info_ptr->palette[i].blue = qBlue(rgb);
-+	    info_ptr_palette[i].red = qRed(rgb);
-+	    info_ptr_palette[i].green = qGreen(rgb);
-+	    info_ptr_palette[i].blue = qBlue(rgb);
- 	    if (image.hasAlphaBuffer()) {
- 		trans[i] = rgb >> 24;
- 		if (trans[i] < 255) {
-@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q
- 		}
- 	    }
- 	}
-+	png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette);
- 	if (num_trans) {
- 	    copy_trans = new png_byte[num_trans];
- 	    for (int i=0; i<num_trans; i++)
-@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q
-     }
- 
-     if ( image.hasAlphaBuffer() ) {
--	info_ptr->sig_bit.alpha = 8;
-+        png_color_8p sig_bit;
-+        png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-+        sig_bit->alpha = 8;
-+        png_set_sBIT(png_ptr, info_ptr, sig_bit);
-     }
- 
-     // Swap ARGB to RGBA (normal PNG format) before saving on
-@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma
- 	    return -1;
- 	}
- 
--	if (setjmp((png_ptr)->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	    image = 0;
- 	    return -1;
-@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma
- 
-     if ( !png_ptr ) return 0;
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	image = 0;
- 	state = MovieStart;
-@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn
-     consumer->frameDone(QPoint(offx,offy),r);
-     consumer->end();
-     state = FrameStart;
--    unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
-+    unused_data = png_process_data_pause(png, 0);
- }
- 
- #ifdef PNG_USER_CHUNKS_SUPPORTED
diff --git a/testing/qtiplot/PKGBUILD b/testing/qtiplot/PKGBUILD
deleted file mode 100644
index d4779fcb7..000000000
--- a/testing/qtiplot/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 168491 2012-10-12 17:58:46Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir.archlinux.org>
-# Contributor: Gergely Imreh <imrehg@gmail.com>
-
-pkgname=qtiplot
-pkgver=0.9.8.9
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://soft.proindependent.com/qtiplot.html"
-pkgdesc="Data analysis and scientific plotting - free clone of Origin"
-depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
-# build against qwtplot3d provided in the package ...
-# build against qwt provided in the package ...
-# as systemwide one doesn't provide all needed functions
-makedepends=('pkg-config' 'boost' 'mesa')
-license=('GPL2')
-install=${pkgname}.install
-source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
-        $pkgname.desktop
-        $pkgname.png
-        build.conf.archlinux
-        qwtplot3d_gcc.patch
-        qtiplot.xml
-	qtiplot-0.9.8.6-gold.patch
-	qtiplot-0.9.8.6-kde.patch
-	qtiplot-0.9.8.6-tamuanova.patch
-        qwtplot3d-qt-4.8.0.patch
-        qwtplot3d-libpng15.patch)
-sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30'
-          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
-          '4301cb2a36024a10108b689990d28c4fe5c7416e'
-          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
-          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
-          '285f57d865956d93250ec548288c5bface096b6b'
-          'b534a609f317cf3117d6495909854cdacea20124'
-          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
-          '830b518e3ef63625df84363a8047417124f243b0'
-          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
-          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # gentoo fixes  
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch"
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch"
-#   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch"
-
-   # build also static qwtplot3d lib
-   echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
-
-  # install build configuration file
-  install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
-
-  # Make qwt
-  sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
-  patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
-  cd ./3rdparty/qwt
-  qmake
-  make
-
-  # Make qwtplot3d
-  cd ../qwtplot3d
-  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
-  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
-  qmake
-  make
-
-  # Make qtiplot
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  # fix stuff
-  sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
-  sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp
-  sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
-
-  qmake qtiplot.pro QMAKESPEC=linux-g++
-  make QTDIR=/usr/ QMAKESPEC=linux-g++
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  INSTALL_ROOT="${pkgdir}" make install
-
-  # make it nice:
-  install -D -m644 "${srcdir}/${pkgname}.png" \
-  	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" \
-  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 "${srcdir}/${pkgname}.xml" \
-        "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
-}
diff --git a/testing/qtiplot/build.conf.archlinux b/testing/qtiplot/build.conf.archlinux
deleted file mode 100644
index 7ccded7fa..000000000
--- a/testing/qtiplot/build.conf.archlinux
+++ /dev/null
@@ -1,32 +0,0 @@
-isEmpty( QTI_ROOT ) {
-  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
-}
-
-SYS_INCLUDEPATH = /usr/include
-SYS_LIBS = -L/usr/lib -lGLU
-
-MUPARSER_LIBS = -lmuparser 
-GSL_LIBS = -lgsl -lgslcblas
-BOOST_INCLUDEPATH = /usr/include/boost
-BOOST_LIBS = -lboost_date_time -lboost_thread
-QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
-QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
-QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-LIB_ORIGIN_LIBS = -lorigin2
-QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
-TAMUANOVA_LIBS = -ltamuanova
-TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
-LIBPNG_LIBS = -lpng
-
-PYTHON = python2
-LUPDATE = lupdate
-LRELEASE = lrelease
-
-SCRIPTING_LANGS += muParser
-SCRIPTING_LANGS += Python
-
-CONFIG          += CustomInstall
-DEFINES         += SCRIPTING_CONSOLE
-
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
deleted file mode 100644
index 3b6757533..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/qtiplot.pro |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 99e0e36..b7cf373 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -20,6 +20,7 @@ LIBS         += $$MUPARSER_LIBS
- LIBS         += $$QWT_LIBS
- LIBS         += $$QWT3D_LIBS
- LIBS         += $$GSL_LIBS
-+LIBS         += -lz
- 
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
deleted file mode 100644
index 919ec6cc2..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/src/plot2D/Graph.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
-index 626172a..d4eab1b 100755
---- a/qtiplot/src/plot2D/Graph.cpp
-+++ b/qtiplot/src/plot2D/Graph.cpp
-@@ -73,6 +73,7 @@
- #include <PatternBox.h>
- #include <SymbolBox.h>
- 
-+#include <QPaintEngine>
- #include <QApplication>
- #include <QBitmap>
- #include <QClipboard>
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
deleted file mode 100644
index 1644266d1..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 95a5f0c..72e99ab 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
- !isEmpty(TAMUANOVA_LIBS) {
- 	DEFINES += HAVE_TAMUANOVA
- 	INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
--	#LIBS        += $$TAMUANOVA_LIBS
--
--	HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
-+	LIBS        += $$TAMUANOVA_LIBS
- }
- 
- ###############################################################
- 
- # At the very end: add global include- and lib path
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
--#unix:LIBS += $$SYS_LIBS
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH
-+unix:LIBS += $$SYS_LIBS
- 
- ###############################################################
- ############### Building QtiPlot as a browser plugin ##########
diff --git a/testing/qtiplot/qtiplot.desktop b/testing/qtiplot/qtiplot.desktop
deleted file mode 100644
index ab64b3852..000000000
--- a/testing/qtiplot/qtiplot.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=qtiplot
-Comment=An application for plotting and analysis of data sets and functions
-Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen
-Terminal=false
-Name=QtiPlot
-Protocols=file
-Icon=/usr/share/pixmaps/qtiplot.png
-# Categories=QT;KDE;Science;Utility;X-KDE-More
-# Categories=Qt;KDE;Math;Education
-Categories=Science;X-Plotting;
diff --git a/testing/qtiplot/qtiplot.install b/testing/qtiplot/qtiplot.install
deleted file mode 100644
index 66631520d..000000000
--- a/testing/qtiplot/qtiplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
diff --git a/testing/qtiplot/qtiplot.png b/testing/qtiplot/qtiplot.png
deleted file mode 100644
index 5b4b87b21..000000000
--- a/testing/qtiplot/qtiplot.png
+++ /dev/null
diff --git a/testing/qtiplot/qtiplot.xml b/testing/qtiplot/qtiplot.xml
deleted file mode 100644
index 7ad4c4aa0..000000000
--- a/testing/qtiplot/qtiplot.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-qtiplot-project">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file</comment>
-    <glob pattern="*.qti" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-compressed">
-    <comment>Compressed QtiPlot project file</comment>
-    <glob pattern="*.qti.gz" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-backup">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file backup</comment>
-    <glob pattern="*.qti~" />
-  </mime-type>
-</mime-info>
diff --git a/testing/qtiplot/qwtplot3d-libpng15.patch b/testing/qtiplot/qwtplot3d-libpng15.patch
deleted file mode 100644
index 828f0c6d8..000000000
--- a/testing/qtiplot/qwtplot3d-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
-+++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
-@@ -47,6 +47,7 @@
- #endif
- 
- #if defined(GL2PS_HAVE_LIBPNG)
-+#include <zlib.h>
- #include <png.h>
- #endif
- 
diff --git a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
deleted file mode 100644
index 9d30f6b7b..000000000
--- a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:42:01.000000000 -0500
-+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:58:30.000000000 -0500
-@@ -2,12 +2,7 @@
- #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
- 
- #include <time.h>
--
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
- 
- #include "qwt3d_types.h"
- #include "qwt3d_io.h"
-diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:42:01.000000000 -0500
-+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:57:21.000000000 -0500
-@@ -2,11 +2,8 @@
- #define __openglhelper_2003_06_06_15_49__
- 
- #include "qglobal.h"
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
-+#include <GL/glu.h>
- 
- namespace Qwt3D
- {
diff --git a/testing/qtiplot/qwtplot3d_gcc.patch b/testing/qtiplot/qwtplot3d_gcc.patch
deleted file mode 100644
index 06aeb50f5..000000000
--- a/testing/qtiplot/qwtplot3d_gcc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
-+++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
-@@ -1,5 +1,6 @@
- #include "qwt3d_surfaceplot.h"
- #include "qwt3d_function.h"
-+#include <cstdio>
- 
- using namespace Qwt3D;
- 
diff --git a/testing/qtiplot/sip.patch b/testing/qtiplot/sip.patch
deleted file mode 100644
index 146f4c277..000000000
--- a/testing/qtiplot/sip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qtiplot/src/scripting/scripting.pri.bak	2009-09-09 07:18:51.000000000 +0800
-+++ qtiplot/src/scripting/scripting.pri	2009-11-08 12:45:03.000000000 +0800
-@@ -80,7 +80,9 @@
-              $${SIP_DIR}/sipqtiPythonScript.cpp\

-              $${SIP_DIR}/sipqtiPythonScripting.cpp\

-              $${SIP_DIR}/sipqtiFolder.cpp\

--             $${SIP_DIR}/sipqtiQList.cpp\

-+             $${SIP_DIR}/sipqtiQList0101Folder.cpp \

-+             $${SIP_DIR}/sipqtiQList0101Graph.cpp \

-+             $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp \

-              $${SIP_DIR}/sipqtiFit.cpp \

-              $${SIP_DIR}/sipqtiExponentialFit.cpp \

-              $${SIP_DIR}/sipqtiTwoExpFit.cpp \

diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD
deleted file mode 100644
index 721a13545..000000000
--- a/testing/readline/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 163780 2012-07-20 01:54:37Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=readline
-_basever=6.2
-_patchlevel=004 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=1
-pkgdesc="GNU readline library"
-arch=('i686' 'x86_64')
-url="http://tiswww.case.edu/php/chet/readline/rltop.html"
-license=('GPL')
-depends=('glibc' 'ncurses')
-backup=('etc/inputrc')
-options=('!emptydirs')
-install=readline.install
-source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
-        inputrc)
-if [ $_patchlevel -gt 00 ]; then
-    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-        source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig})
-    done
-fi
-md5sums=('67948acb2ca081f23359d0256e9a271c'
-         '928f7d248320a65e43c2dc427e99582b'
-         '58d54966c1191db45973cb3191ac621a'
-         '83287d52a482f790dfb30ec0a8746669'
-         '8e6a51e2e0e6e45a82752e3692c111ac'
-         '0665020ea118e8434bd145fb71f452cc'
-         '285361ca6d48c51ae2428157e174e812'
-         'c9d5d79718856e711667dede87cb7622'
-         '4437205bb1462f5f32e4812b8292c675'
-         'c08e787f50579ce301075c523fa660a4'
-         '7e39cad1d349b8ae789e4fc33dbb235f')
-
-build() {
-  cd ${srcdir}/${pkgname}-$_basever
-  for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-    msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
-    patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
-  done
-
-  # Remove RPATH from shared objects (FS#14366)
-  sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
-
-  # build with -fPIC for x86_64 (FS#15634)
-  [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
-
-  ./configure --prefix=/usr
-  make SHLIB_LIBS=-lncurses
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make DESTDIR=${pkgdir} install
-  
-  install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
-}
diff --git a/testing/readline/inputrc b/testing/readline/inputrc
deleted file mode 100644
index fd13a673b..000000000
--- a/testing/readline/inputrc
+++ /dev/null
@@ -1,36 +0,0 @@
-# do not bell on tab-completion
-#set bell-style none
-
-set meta-flag on
-set input-meta on
-set convert-meta off
-set output-meta on
-
-$if mode=emacs
-
-# for linux console and RH/Debian xterm
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
-"\e[7~": beginning-of-line
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-"\e[5C": forward-word
-"\e[5D": backward-word
-"\e\e[C": forward-word
-"\e\e[D": backward-word
-"\e[1;5C": forward-word
-"\e[1;5D": backward-word
-
-# for rxvt
-"\e[8~": end-of-line
-
-# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
-"\eOH": beginning-of-line
-"\eOF": end-of-line
-
-# for freebsd console
-"\e[H": beginning-of-line
-"\e[F": end-of-line
-$endif
diff --git a/testing/readline/readline.install b/testing/readline/readline.install
deleted file mode 100644
index 06b646f23..000000000
--- a/testing/readline/readline.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(history.info readline.info rluserman.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-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/rest/PKGBUILD b/testing/rest/PKGBUILD
deleted file mode 100644
index e21b8d110..000000000
--- a/testing/rest/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169158 2012-10-18 19:22:47Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=rest
-pkgver=0.7.90
-pkgrel=1
-pkgdesc="A helper library for RESTful services."
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libxml2' 'libsoup-gnome')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022')
-
-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/rfkill/PKGBUILD b/testing/rfkill/PKGBUILD
deleted file mode 100644
index 2d03e6dbb..000000000
--- a/testing/rfkill/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 165297 2012-08-15 01:17:54Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rfkill
-pkgver=0.4
-pkgrel=5
-pkgdesc='Tool for enabling and disabling wireless devices'
-url='http://linuxwireless.org/en/users/Documentation/rfkill'
-license=('custom')
-arch=('i686' 'x86_64')
-source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'rules.d'
-        'service'
-        'conf.d'
-        'rc.d')
-sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
-          '6390eaa793b473098aaa11b13c5254d611a4c13a'
-          'cadc563f967c5ac680e7cdfd764718b412201f8a'
-          'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
-          '380af0b002f51543557306ed68a27f0059fd5a6f')
-
-backup=('etc/conf.d/rfkill')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
-	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service"
-	install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
-}
diff --git a/testing/rfkill/conf.d b/testing/rfkill/conf.d
deleted file mode 100644
index 4483da26c..000000000
--- a/testing/rfkill/conf.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# /etc/conf.d/rfkill
-# Configuration for the rfkill startup script
-#
-
-# List of devices to block on startup (space-separated)
-RFKILL_BLOCK=""
-
-# List of devices to unblock on startup (space-separated)
-RFKILL_UNBLOCK="all"
-
-# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ...
-# See "rfkill list" for available devices
-# Examples:
-#
-# Block all bluetooth devices:
-# RFKILL_BLOCK="bluetooth"
-#
-# Unblock the phy0 wifi device and all wwan devices:
-# RFKILL_UNBLOCK="phy0 wwan"
diff --git a/testing/rfkill/rc.d b/testing/rfkill/rc.d
deleted file mode 100755
index ce90ee150..000000000
--- a/testing/rfkill/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rfkill
-
-case "$1" in
-  start)
-    for device in ${RFKILL_BLOCK}; do
-      stat_busy "Blocking rfkill device: ${device}"
-      /usr/sbin/rfkill block ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    for device in ${RFKILL_UNBLOCK}; do
-      stat_busy "Unblocking rfkill device: ${device}"
-      /usr/sbin/rfkill unblock ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start}"
-    exit 1
-    ;;
-esac
-exit 0
diff --git a/testing/rfkill/rules.d b/testing/rfkill/rules.d
deleted file mode 100644
index bc98a3bef..000000000
--- a/testing/rfkill/rules.d
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
diff --git a/testing/rfkill/service b/testing/rfkill/service
deleted file mode 100644
index decd5b6fc..000000000
--- a/testing/rfkill/service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=RFKill-Block Selected Devices
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/rfkill block 9999
-ExecStop=/usr/sbin/rfkill unblock all
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD
deleted file mode 100644
index 2c507c786..000000000
--- a/testing/rhythmbox/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 169157 2012-10-18 19:22:44Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rhythmbox
-pkgver=2.98
-pkgrel=2
-pkgdesc="An iTunes-like music playback and management application"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.rhythmbox.org"
-depends=('dconf' 'desktop-file-utils' 'grilo'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
-         'libdmapsharing' 'libgpod' 'libmtp' 'libnotify' 'libpeas'
-         'lirc-utils' 'media-player-info' 'python2-gobject' 'python2-mako' 'totem-plparser'
-         'tdb' 'libdiscid')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala')
-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')
-install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/rhythmbox \
-      --localstatedir=/var --disable-static \
-      --enable-daap --enable-python --enable-vala \
-      --with-mdns=avahi --disable-scrollkeeper --without-webkit
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
-}
diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install
deleted file mode 100644
index e02ee2c16..000000000
--- a/testing/rhythmbox/rhythmbox.install
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/rosegarden/PKGBUILD b/testing/rosegarden/PKGBUILD
deleted file mode 100644
index 3fefe02e1..000000000
--- a/testing/rosegarden/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 163958 2012-07-22 18:37:45Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Robert Emil Berge <robert@rebi.no>
-
-pkgname=rosegarden
-pkgver=12.04
-pkgrel=2
-pkgdesc="MIDI/audio sequencer and notation editor"
-arch=('i686' 'x86_64')
-url="http://www.rosegardenmusic.com/"
-license=('GPL')
-depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
-         'perl' 'qt' 'shared-mime-info')
-makedepends=('imake')
-optdepends=('lilypond: notation display'
-            'cups: printing support'
-            'okular: print preview, or any other PDF viewer'
-            'timidity++: MIDI playback, or any other softsynth'
-            'flac'
-            'wavpack')
-[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('b11f4fcad69df45365d2125181524559')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # lrdf + raptor2 compatibility
-  export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/rosegarden/rosegarden.install b/testing/rosegarden/rosegarden.install
deleted file mode 100644
index 5119faec2..000000000
--- a/testing/rosegarden/rosegarden.install
+++ /dev/null
@@ -1,14 +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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/rpcbind/PKGBUILD b/testing/rpcbind/PKGBUILD
deleted file mode 100644
index f4af6f1e0..000000000
--- a/testing/rpcbind/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 165544 2012-08-23 12:23:46Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=rpcbind
-pkgver=0.2.0
-pkgrel=9
-pkgdesc="portmap replacement which supports RPC over various protocols"
-arch=(i686 x86_64)
-depends=('bash' 'glibc' 'libtirpc')
-url="http://rpcbind.sourceforge.net"
-license=('custom')
-replaces=('portmap')
-source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2
-        rpcbind-sunrpc.patch
-        rpcbind.service
-        rpcbind)
-md5sums=('1a77ddb1aaea8099ab19c351eeb26316'
-         'c02ac36a98baac70b8a26190524b7b73'
-         'a7b23a32be2eb52d7dec52da36d4eba1'
-         '78a963654f57cbb209e228884767836e')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # patch for iana services file
-  patch -Np1 -i ../rpcbind-sunrpc.patch
-  ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run
-  make
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  # install missing man page - https://bugs.archlinux.org/task/21271
-  install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/
-  # install daemon 
-  install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind
-  # install systemd service file
-  install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service
-  # install license
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/rpcbind/COPYING
-}
diff --git a/testing/rpcbind/rpcbind b/testing/rpcbind/rpcbind
deleted file mode 100755
index 87c5b50da..000000000
--- a/testing/rpcbind/rpcbind
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$(pidof -o %PPID /usr/bin/rpcbind)"
-case "$1" in
-  start)
-    stat_busy "Starting rpcbind"
-    [ -z "$PID" ] && /usr/bin/rpcbind &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/rpcbind)
-      echo $PID > /var/run/rpcbind.pid
-      add_daemon rpcbind
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping rpcbind"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/rpcbind.pid
-      rm_daemon rpcbind
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/rpcbind/rpcbind-sunrpc.patch b/testing/rpcbind/rpcbind-sunrpc.patch
deleted file mode 100644
index 76cf54ba9..000000000
--- a/testing/rpcbind/rpcbind-sunrpc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- rpcbind-0.1.7/src/rpcbind.c.orig	2008-11-19 14:17:34.000000000 +0100
-+++ rpcbind-0.1.7/src/rpcbind.c	2010-01-07 13:03:37.416632894 +0100
-@@ -114,7 +114,7 @@
- char *udp_uaddr;	/* Universal UDP address */
- char *tcp_uaddr;	/* Universal TCP address */
- #endif
--static char servname[] = "rpcbind";
-+static char servname[] = "sunrpc";
- static char superuser[] = "superuser";
- 
- int main __P((int, char *[]));
---- rpcbind-0.1.7/src/rpcinfo.c~	2010-01-08 16:14:24.592156602 +0000
-+++ rpcbind-0.1.7/src/rpcinfo.c	2010-01-08 16:14:31.578838609 +0000
-@@ -633,7 +633,7 @@
- 	{
- 	  memset (&hints, 0, sizeof hints);
- 	  hints.ai_family = AF_INET;
--	  if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 &&
-+	  if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 &&
-               (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0)
- 	    {
- 	      fprintf (stderr, "rpcinfo: %s: %s\n",
diff --git a/testing/rpcbind/rpcbind.service b/testing/rpcbind/rpcbind.service
deleted file mode 100644
index 3bc764efc..000000000
--- a/testing/rpcbind/rpcbind.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC Bind
-After=network.target
-Wants=rpcbind.target
-Before=rpcbind.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/rpcbind
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD
deleted file mode 100644
index 0732107ea..000000000
--- a/testing/ruby/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Jeramy Rutley <jrutley@gmail.com>
-
-pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p286
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.ruby-lang.org/en/'
-license=('BSD' 'custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
-options=('!emptydirs' '!makeflags')
-source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc')
-md5sums=('2278eff4cfed3cbc0653bc73085caa34'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
-
-build() {
-  cd ruby-${pkgver//_/-}
-
-  PKG_CONFIG=/usr/bin/pkg-config ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-pthread \
-    --disable-rpath
-
-  make
-}
-
-check() {
-  cd ruby-${pkgver//_/-}
-
-  make test
-}
-
-package_ruby() {
-  pkgdesc='An object-oriented language for quick and easy programming'
-  depends=('openssl' 'libffi' 'libyaml')
-  optdepends=('tk: for Ruby/TK'
-              'ruby-docs: Ruby documentation')
-  provides=('rubygems' 'rake')
-  conflicts=('rake')
-  backup=('etc/gemrc')
-  install='ruby.install'
-
-  cd ruby-${pkgver//_/-}
-
-  make DESTDIR="${pkgdir}" install-nodoc
-
-  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
-}
-
-package_ruby-docs() {
-  pkgdesc='Documentation files for ruby'
-
-  cd ruby-${pkgver//_/-}
-
-  make DESTDIR="${pkgdir}" install-doc install-capi
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
-}
-md5sums=('e76848a86606a4fd5dcf14fc4b4e755e'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
diff --git a/testing/ruby/gemrc b/testing/ruby/gemrc
deleted file mode 100644
index 3d11de1ec..000000000
--- a/testing/ruby/gemrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
-
-# --user-install is used to install to $HOME/.gem/ by default since we want to separate
-#                pacman installed gems and gem installed gems
-gem: --user-install
diff --git a/testing/ruby/ruby.install b/testing/ruby/ruby.install
deleted file mode 100644
index ce78e96ec..000000000
--- a/testing/ruby/ruby.install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-print_gem_default_target() {
-  echo 'The default location of gem installs is $HOME/.gem/ruby'
-  echo 'Add the following line to your PATH if you plan to install using gem'
-  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
-  echo 'If you want to install to the system wide location, you must either:'
-  echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
-}
-
-# arg 1:  the new package version
-post_install() {
-  print_gem_default_target
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
-    print_gem_default_target
-  fi
-}
diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD
deleted file mode 100644
index e27124c0a..000000000
--- a/testing/run-parts/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 167126 2012-09-25 19:19:49Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=run-parts
-pkgver=4.3.4
-pkgrel=1
-pkgdesc='run scripts or programs in a directory'
-arch=('i686' 'x86_64')
-url='http://packages.qa.debian.org/d/debianutils.html'
-license=('GPL')
-depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz")
-sha256sums=('1739976cb62b85e641ee36859a87dfb8e4c3214e1043b6bb00b56b87e96a19f5')
-
-build() {
-	cd $srcdir/debianutils-$pkgver
-	./configure --prefix=/usr
-	make run-parts
-}
-
-package() {
-	cd $srcdir/debianutils-$pkgver
-	install -D -m755 run-parts $pkgdir/usr/bin/run-parts
-	install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8
-	for l in po4a/*/run-parts.8; do
-		install -D -m644  ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8
-	done
-}
diff --git a/testing/sane/PKGBUILD b/testing/sane/PKGBUILD
deleted file mode 100644
index a72581f79..000000000
--- a/testing/sane/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 161936 2012-06-16 17:16:49Z dreisner $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Simo L. <neotuli@yahoo.com>
-# Contributor: eric <eric@archlinux.org>
-
-pkgname=sane
-pkgver=1.0.22
-pkgrel=9
-pkgdesc="Scanner Access Now Easy"
-url="http://www.sane-project.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libusb-compat' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
-makedepends=('texlive-latexextra')
-install=$pkgname.install
-backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,mustek_usb2.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
-source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
-        'sane.xinetd'
-        'libv4l-0.8.3.patch'
-        'xerox_mfp_fix_usb_devices.patch'
-        'saned.socket'
-        'saned.service')
-options=(!libtool)
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
-         'da946cc36fb83612162cf9505986d4b2'
-         'e645a8921cff9f18ffbdabb2ed885060'
-         'cfef73e7db7c28308914d3db6767d852'
-         'e57e9e15528f47f5f1b3f1411135ed5d'
-         'e44bd4c994a52d6f472463d1eb0a03be')
-
-build() {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
-  patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch
-  # fix https://bugs.archlinux.org/task/26114
-  patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --with-docdir=/usr/share/doc/sane \
-    --enable-avahi \
-    --enable-pthread \
-    --disable-rpath \
-    --disable-locking
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # fix hp officejets
-  echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
-  # install udev files
-  install -D -m0644 tools/udev/libsane.rules \
-    "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
-  # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
-  
-  # install xinetd file
-  install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-  
-  # Install the pkg-config file
-  install -D -m644 tools/sane-backends.pc \
-     "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
-  # install systemd files
-  install -D -m644 ${srcdir}/saned.socket \
-      "${pkgdir}/usr/lib/systemd/system/saned.socket"
-  install -D -m644 ${srcdir}/saned.service \
-      "${pkgdir}/usr/lib/systemd/system/saned@.service"
-}
diff --git a/testing/sane/libv4l-0.8.3.patch b/testing/sane/libv4l-0.8.3.patch
deleted file mode 100644
index 4e240e0cf..000000000
--- a/testing/sane/libv4l-0.8.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb@jblache.org>
-Date:   Wed Feb 16 19:37:43 2011 +0100
-
-    Fix v4l build with libv4l 0.8.3+
-
-    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
-    Conflicts:
-
-    	ChangeLog
-
-    Signed-off-by: Nils Philippsen <nils@redhat.com>
----
- backend/v4l.c |    3 +--
- backend/v4l.h |    3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
- 
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
- 
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
- 
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
- 
-@@ -165,7 +166,7 @@ struct video_channel
- 
- 
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
- 
- #include <../include/sane/sane.h>
- 
--- 
-1.7.4
-
diff --git a/testing/sane/sane.install b/testing/sane/sane.install
deleted file mode 100644
index 5ec361eea..000000000
--- a/testing/sane/sane.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	/bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}
diff --git a/testing/sane/sane.xinetd b/testing/sane/sane.xinetd
deleted file mode 100644
index b035664b4..000000000
--- a/testing/sane/sane.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service sane-port
-{
-	port        = 6566
-	socket_type = stream
-	wait        = no
-	user        = root
-	group       = scanner
-	server      = /usr/sbin/saned
-	# disabled by default!
-	disable     = yes
-		  }
diff --git a/testing/sane/saned.service b/testing/sane/saned.service
deleted file mode 100644
index 69e833e7e..000000000
--- a/testing/sane/saned.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/sbin/saned
-StandardInput=socket
-StandardError=syslog
diff --git a/testing/sane/saned.socket b/testing/sane/saned.socket
deleted file mode 100644
index 66ef9c9c8..000000000
--- a/testing/sane/saned.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=saned incoming socket
-
-[Socket]
-ListenStream=6566
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/testing/sane/xerox_mfp_fix_usb_devices.patch b/testing/sane/xerox_mfp_fix_usb_devices.patch
deleted file mode 100644
index 5ed29b974..000000000
--- a/testing/sane/xerox_mfp_fix_usb_devices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc@telekom.ru>
-Date:   Tue Mar 8 17:57:19 2011 +0300
-
-    keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL;	/* sane_get_devices array */
- static struct device *devices_head = NULL;	/* sane_get_devices list */
- 
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
-     { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
-     { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
--    { 0 }
- };
- 
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
-   devices_head = NULL;
- }
- 
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+  if (strncmp("tcp", devname, 3) == 0)
-+    return &available_transports[TRANSPORT_TCP];
-+  return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
-       return SANE_STATUS_GOOD;
-   }
- 
--  for (tr = available_transports; tr->ttype; tr++) {
--    if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--      break;
--  }
--  if (!tr->ttype)
--    return SANE_STATUS_INVAL;
-+  tr = tr_from_devname(devname);
- 
-   dev = calloc (1, sizeof (struct device));
-   if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
--    transport *tr;
--
--    for (tr = available_transports; tr->ttype; tr++) {
--	if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--	    return tr->configure_device(devname, list_one_device);
--    }
--    return	SANE_STATUS_INVAL;
-+  return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
- 
- SANE_Status
diff --git a/testing/screen/PKGBUILD b/testing/screen/PKGBUILD
deleted file mode 100644
index e23d05c06..000000000
--- a/testing/screen/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 169508 2012-10-22 18:01:13Z thomas $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: dorphell <dorphell@gmx.net>
-
-pkgname=screen
-pkgver=4.0.3
-pkgrel=14
-_ptygroup=5 #the UID of our PTY/TTY group
-pkgdesc="Full-screen window manager that multiplexes a physical terminal"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/screen/"
-license=('GPL')
-depends=('ncurses' 'pam')
-backup=('etc/screenrc' 'etc/pam.d/screen')
-options=('!makeflags')
-install=screen.install
-source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz
-        screen-4.0.3-long-term.patch
-        screen-4.0.3-caption-colors.patch
-        screen.pam)
-md5sums=('8506fd205028a96c741e4037de6e3c42'
-         '2723c3e71d5a2e5a74b6ddbc5215ef0f'
-         '191b6ced695ce2ae3a65bf02c2d4220f'
-         '74f7919d7b65436cc2ea5341fa8ca374')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/screen-4.0.3-long-term.patch
-  patch -Np2 -i $srcdir/screen-4.0.3-caption-colors.patch
-  
-  ./configure --prefix=/usr --enable-pam \
-        --with-sys-screenrc=/etc/screenrc --enable-colors256 \
-       --enable-rxvt_osc --enable-telnet \
-       --with-pty-group=$_ptygroup \
-       --mandir=/usr/share/man --infodir=/usr/share/info \
-       --with-socket-dir=/run/screens
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen
-
-  install -Dm644 etc/completer.zsh ${pkgdir}/usr/share/zsh/site-functions/screen
-  install -Dm644 etc/etcscreenrc ${pkgdir}/etc/screenrc
-  install -Dm644 etc/screenrc ${pkgdir}/etc/skel/.screenrc
-}
diff --git a/testing/screen/screen-4.0.3-caption-colors.patch b/testing/screen/screen-4.0.3-caption-colors.patch
deleted file mode 100644
index c92cb0c54..000000000
--- a/testing/screen/screen-4.0.3-caption-colors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001
-From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net>
-Date: Tue, 26 Jan 2010 20:17:26 +0000
-Subject: Accommodate more color changes in the caption.
-
----
-diff --git a/src/screen.c b/src/screen.c
-index b1c3dfb..2cceae0 100644
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
- #endif
- 
- static char winmsg_buf[MAXSTR];
--#define MAX_WINMSG_REND 16	/* rendition changes */
-+#define MAX_WINMSG_REND 256	/* rendition changes */
- static int winmsg_rend[MAX_WINMSG_REND];
- static int winmsg_rendpos[MAX_WINMSG_REND];
- static int winmsg_numrend;
---
-cgit v0.8.3.4
diff --git a/testing/screen/screen-4.0.3-long-term.patch b/testing/screen/screen-4.0.3-long-term.patch
deleted file mode 100644
index 3e66acda6..000000000
--- a/testing/screen/screen-4.0.3-long-term.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h
---- screen-4.0.3-orig//display.h	2003-07-02 00:01:42.000000000 +1000
-+++ screen-4.0.3/display.h	2010-12-03 20:19:23.826671689 +1000
-@@ -85,7 +85,7 @@
-   struct win *d_other;		/* pointer to other window */
-   int   d_nonblock;		/* -1 don't block if obufmax reached */
- 				/* >0: block after nonblock secs */
--  char  d_termname[20 + 1];	/* $TERM */
-+  char  d_termname[40 + 1];	/* $TERM */
-   char	*d_tentry;		/* buffer for tgetstr */
-   char	d_tcinited;		/* termcap inited flag */
-   int	d_width, d_height;	/* width/height of the screen */
-diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h
---- screen-4.0.3-orig//screen.h	2003-08-22 22:28:43.000000000 +1000
-+++ screen-4.0.3/screen.h	2010-12-03 20:19:43.163338333 +1000
-@@ -202,7 +202,7 @@
- 	  char preselect[20];
- 	  int esc;		/* his new escape character unless -1 */
- 	  int meta_esc;		/* his new meta esc character unless -1 */
--	  char envterm[20 + 1];	/* terminal type */
-+	  char envterm[40 + 1];	/* terminal type */
- 	  int encoding;		/* encoding of display */
- 	}
-       attach;
diff --git a/testing/screen/screen.install b/testing/screen/screen.install
deleted file mode 100644
index 9340e6067..000000000
--- a/testing/screen/screen.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5)
-
-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/screen/screen.pam b/testing/screen/screen.pam
deleted file mode 100644
index 07c42adb1..000000000
--- a/testing/screen/screen.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix.so
diff --git a/testing/sdl_gfx/PKGBUILD b/testing/sdl_gfx/PKGBUILD
deleted file mode 100644
index 3a6b7c442..000000000
--- a/testing/sdl_gfx/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 165798 2012-08-30 16:55:11Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sdl_gfx
-pkgver=2.0.24
-pkgrel=1
-pkgdesc="SDL Graphic Primitives"
-arch=('i686' 'x86_64')
-license=('LGPL')
-options=(!libtool)
-url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx"
-source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz)
-depends=('sdl')
-md5sums=('838514185ff9a3b6377760aaa52fef8a')
-
-build() {
-  cd SDL_gfx-${pkgver}
-
-  if [ "${CARCH}" == "x86_64" ]; then
-    ./configure --prefix=/usr --disable-mmx
-  else
-    ./configure --prefix=/usr
-  fi
-
-  make
-}
-
-package() {
-  cd SDL_gfx-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD
deleted file mode 100644
index ed69bae3c..000000000
--- a/testing/seahorse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169514 2012-10-22 21:16:04Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Michel Brabants <michel.linux@tiscali.be>
-
-pkgname=seahorse
-pkgver=3.6.2
-pkgrel=1
-pkgdesc="GNOME application for managing PGP keys."
-arch=(i686 x86_64)
-license=(GPL)
-url="http://projects.gnome.org/seahorse/"
-depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils hicolor-icon-theme dconf)
-makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm)
-optdepends=('openssh: SSH support')
-provides=(x11-ssh-askpass)
-options=('!libtool' '!emptydirs')
-groups=(gnome-extra)
-install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        seahorse-ssh-askpass.sh)
-sha256sums=('cf3ffa48fdbd4c30fa3cc7ea9e8188c1325416e67e5985c9ce22af0a5fd7560b'
-            '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-ldap --enable-hkp \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \
-    "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh"
-}
diff --git a/testing/seahorse/seahorse-ssh-askpass.sh b/testing/seahorse/seahorse-ssh-askpass.sh
deleted file mode 100644
index 04f79d8f2..000000000
--- a/testing/seahorse/seahorse-ssh-askpass.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then
-  export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass
-fi
diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install
deleted file mode 100644
index 1571179ca..000000000
--- a/testing/seahorse/seahorse.install
+++ /dev/null
@@ -1,13 +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
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE
deleted file mode 100644
index c5ab15a56..000000000
--- a/testing/shadow/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 1990 - 1994, Julianne Frances Haugh
- * Copyright (c) 1996 - 2000, Marek Michałkiewicz
- * Copyright (c) 2001 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2009, Nicolas François
- * 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.
- * 3. The name of the copyright holders or contributors may not be used to
- *    endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
deleted file mode 100644
index c82fb65dc..000000000
--- a/testing/shadow/PKGBUILD
+++ /dev/null
@@ -1,131 +0,0 @@
-# $Id: PKGBUILD 162811 2012-06-30 18:46:44Z tomegun $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=shadow
-pkgver=4.1.5.1
-pkgrel=1
-pkgdesc="Password and account management tool suite with support for shadow files and PAM"
-arch=('i686' 'x86_64')
-url='http://pkg-shadow.alioth.debian.org/'
-license=('BSD')
-groups=('base')
-depends=('bash' 'pam' 'acl')
-backup=(etc/login.defs
-        etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel}
-        etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
-        etc/pam.d/{chgpasswd,groupmems}
-        etc/default/useradd)
-options=('!libtool')
-install='shadow.install'
-source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
-        LICENSE
-        adduser
-        chgpasswd
-        chpasswd
-        defaults.pam
-        login.defs
-        newusers
-        passwd
-        shadow.cron.daily
-        useradd.defaults
-        xstrdup.patch
-        shadow-strncpy-usage.patch)
-sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
-          '126570e2939bf3b57f28df5197ab9309747a6b5c'
-          '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
-          '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
-          '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
-          '12427b1ca92a9b85ca8202239f0d9f50198b818f'
-          '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
-          'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
-          '12427b1ca92a9b85ca8202239f0d9f50198b818f'
-          '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
-          '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
-          '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
-          '6010fffeed1fc6673ad9875492e1193b1a847b53'
-          '21e12966a6befb25ec123b403cd9b5c492fe5b16')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # avoid transitive linking issues with binutils 2.22
-  sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am
-
-  # link to glibc's crypt(3)
-  LDFLAGS+=" -lcrypt"
-
-  # need to offer these upstream
-  patch -Np1 <"$srcdir/xstrdup.patch"
-  patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
-
-  # supress etc/pam.d/*, we provide our own
-  sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/lib \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc \
-    --with-libpam \
-    --without-selinux
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
-
-  # interactive useradd
-  install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
-
-  # useradd defaults
-  install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
-
-  # cron job
-  install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow"
-
-  # login.defs
-  install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
-
-  # PAM config - custom
-  install -dm755 "$pkgdir/etc/pam.d"
-  install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{passwd,chgpasswd,chpasswd,newusers}
-
-  # PAM config - from tarball
-  install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems"
-
-  # we use the 'useradd' PAM file for other similar utilities
-  for file in chage groupadd groupdel groupmod shadow \
-      useradd usermod userdel; do
-    install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
-  done
-
-  # Remove utilities provided by util-linux
-  rm \
-      "$pkgdir"/usr/bin/{chsh,chfn,sg} \
-      "$pkgdir"/bin/{login,su} \
-      "$pkgdir"/usr/sbin/{vipw,vigr}
-
-  # but we keep newgrp, as sg is really an alias to it
-  mv "$pkgdir"/usr/bin/{newgrp,sg}
-
-  # ...and their many man pages
-  find "$pkgdir"/usr/share/man \
-      '(' -name 'chsh.1'  -o \
-          -name 'chfn.1'  -o \
-          -name 'su.1'    -o \
-          -name 'login.1' -o \
-          -name 'vipw.8'  -o \
-          -name 'vigr.8'  -o \
-          -name 'newgrp.1' ')' \
-      -delete
-  rmdir \
-      "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \
-      "$pkgdir"/usr/share/man/{fi,ko/man8}
-}
diff --git a/testing/shadow/adduser b/testing/shadow/adduser
deleted file mode 100644
index a5d7fd4fa..000000000
--- a/testing/shadow/adduser
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/bin/bash
-#
-# Copyright 1995  Hrvoje Dogan, Croatia.
-# Copyright 2002, 2003, 2004  Stuart Winter, West Midlands, England, UK.
-# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  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.
-#
-#
-##########################################################################
-# Program: /usr/sbin/adduser
-# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
-# Author : Stuart Winter <stuart@polplex.co.uk>
-#          Based on the original Slackware adduser by Hrvoje Dogan
-#          with modifications by Patrick Volkerding
-# Version: 1.09
-##########################################################################
-# Usage..: adduser [<new_user_name>]
-##########################################################################
-# History #
-###########
-# v1.09 - 07/06/04 
-#       * Added standard Slackware script licence to the head of this file.
-# v1.08 - 25/04/04
-#       * Disallow user names that begin with a numeric because useradd 
-#         (from shadow v4.03) does not allow them. <sw>
-# v1.07 - 07/03/03
-#       * When supplying a null string for the uid (meaning 'Choose next available'), 
-#         if there were file names in the range 'a-z' in the pwd then the 
-#         egrep command considered these files rather than the null string. 
-#         The egrep expression is now in quotes.  
-#         Reported & fixed by Vadim O. Ustiansky <sw>
-# v1.06 - 31/03/03
-#       * Ask to chown user.group the home directory if it already exists.
-#         This helps reduce later confusion when adding users whose home dir
-#         already exists (mounted partition for example) and is owned
-#         by a user other than the user to which the directory is being
-#         assigned as home.  Default is not to chown.
-#         Brought to my attention by mRgOBLIN. <sw>
-# v1.05 - 04/01/03
-#       * Advise & prevent users from creating logins with '.' characters
-#         in the user name. <sw>
-#       * Made pending account creation info look neater <sw>
-# v1.04 - 09/06/02
-#       * Catered for shadow-4.0.3's 'useradd' binary that no longer
-#         will let you create a user that has any uppercase chars in it
-#         This was reported on the userlocal.org forums
-#         by 'xcp' - thanks. <sw,pjv>
-# v1.03 - 20/05/02
-#       * Support 'broken' (null lines in) /etc/passwd and 
-#         /etc/group files <sw>       
-#       * For recycling UIDs (default still 'off'), we now look in 
-#         /etc/login.defs for the UID_MIN value and use it
-#         If not found then default to 1000 <sw>
-# v1.02 - 10/04/02
-#       * Fix user-specified UID bug. <pjv>
-# v1.01 - 23/03/02
-#       * Match Slackware indenting style, simplify. <pjv>
-# v1.00 - 22/03/02
-#       * Created
-#######################################################################
-
-# Path to files
-pfile=/etc/passwd
-gfile=/etc/group
-sfile=/etc/shells
-
-# Paths to binaries
-useradd=/usr/sbin/useradd
-chfn=/usr/bin/chfn
-passwd=/usr/bin/passwd
-
-# Defaults
-defhome=/home
-defshell=/bin/bash
-defgroup=users
-
-# Determine what the minimum UID is (for UID recycling)
-# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
-export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
-# If we couldn't find it, set it to the default of 1000
-if [ -z "$recycleUIDMIN" ]; then
-   export recycleUIDMIN=1000  # this is the default from Slackware's /etc/login.defs
-fi
-
-
-# This setting enables the 'recycling' of older unused UIDs.
-# When you userdel a user, it removes it from passwd and shadow but it will
-# never get used again unless you specify it expliticly -- useradd (appears to) just
-# look at the last line in passwd and increment the uid.  I like the idea of 
-# recycling uids but you may have very good reasons not to (old forgotten
-# confidential files still on the system could then be owned by this new user).
-# We'll set this to no because this is what the original adduser shell script
-# did and it's what users expect.
-recycleuids=no
-
-# Function to read keyboard input.
-# bash1 is broken (even ash will take read -ep!), so we work around
-# it (even though bash1 is no longer supported on Slackware).
-function get_input() { 
-  local output
-  if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then
-    echo -n "${1} " >&2 # fudge for use with bash v1
-    read output
-  else # this should work with any other /bin/sh
-    read -ep "${1} " output
-  fi
-  echo $output
-}
-
-# Function to display the account info
-function display () {
-  local goose
-  goose="$(echo $2 | cut -d ' ' -f 2-)"  # lop off the prefixed argument useradd needs
-  echo -n "$1 "
-  # If it's null then display the 'other' information
-  if [ -z "$goose" -a ! -z "$3" ]; then 
-    echo "$3" 
-  else 
-    echo "$goose" 
-  fi
-}
-
-# Function to check whether groups exist in the /etc/group file
-function check_group () {
-  local got_error group
-  if [ ! -z "$@" ]; then  
-  for group in $@ ; do
-    local uid_not_named="" uid_not_num=""
-    grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes  
-    grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
-    if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
-      echo "- Group '$group' does not exist"
-      got_error=yes
-    fi
-  done
-  fi
-  # Return exit code of 1 if at least one of the groups didn't exist
-  if [ ! -z "$got_error" ]; then
-    return 1
-  fi
-}   
-
-#: Read the login name for the new user :#
-#
-# Remember that most Mail Transfer Agents are case independant, so having
-# 'uSer' and 'user' may cause confusion/things to break.  Because of this,
-# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
-# and we must reject them, too.
-
-# Set the login variable to the command line param
-echo
-LOGIN="$1"
-needinput=yes
-while [ ! -z $needinput ]; do
-  if [ -z "$LOGIN" ]; then 
-    while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done
-  fi
-  grep "^${LOGIN}:" $pfile >/dev/null 2>&1  # ensure it's not already used
-  if [ $? -eq 0 ]; then
-    echo "- User '$LOGIN' already exists; please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then
-    echo "- User names cannot begin with a number; please choose another"
-    unset LOGIN
-  elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase
-    echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then
-    echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
-    unset LOGIN
-  else
-    unset needinput
-  fi
-done
-
-# Display the user name passed from the shell if it hasn't changed
-if [ "$1" = "$LOGIN" ]; then
-  echo "Login name for new user: $LOGIN"
-fi
-
-#: Get the UID for the user & ensure it's not already in use :#
-#
-# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
-# when you change password for the uid, it finds the first match in /etc/passwd 
-# which isn't necessarily the correct user
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
-  grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
-  if [ $? -eq 0 ]; then
-    echo "- That UID is already in use; please choose another"
-  elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
-    echo "- UIDs are numerics only"         
-  else
-    unset needinput
-  fi
-done
-# If we were given a UID, then syntax up the variable to pass to useradd
-if [ ! -z "$_UID" ]; then 
-  U_ID="-u ${_UID}"
-else
-  # Will we be recycling UIDs?
-  if [ "$recycleuids" = "yes" ]; then
-    U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
-  fi   
-fi
-
-#: Get the initial group for the user & ensure it exists :#
-#
-# We check /etc/group for both the text version and the group ID number 
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  GID="$(get_input "Initial group [ ${defgroup} ]:")"
-  check_group "$GID"
-  if [ $? -gt 0 ]; then
-    echo "- Please choose another"
-  else
-    unset needinput 
-  fi
-done
-# Syntax the variable ready for useradd
-if [ -z "$GID" ]; then
-  GID="-g ${defgroup}"
-else
-  GID="-g ${GID}"
-fi
-
-#: Get additional groups for the user :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  AGID="$(get_input "Additional groups (comma separated) []:")"
-  AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing 
-  if [ ! -z "$AGID" ]; then
-    check_group "$AGID"  # check all groups at once (treated as N # of params)
-    if [ $? -gt 0 ]; then
-      echo "- Please re-enter the group(s)"
-    else
-      unset needinput # we found all groups specified
-      AGID="-G $(echo "$AGID" | tr ' ' ,)"
-    fi
-  else
-    unset needinput   # we don't *have* to have additional groups
-  fi
-done
-
-#: Get the new user's home dir :#
-#       
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
-  if [ -z "$HME" ]; then
-    HME="${defhome}/${LOGIN}"
-  fi 
-  # Warn the user if the home dir already exists
-  if [ -d "$HME" ]; then
-    echo "- Warning: '$HME' already exists !"
-    getyn="$(get_input "  Do you wish to change the home directory path ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-      # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
-      getyn="$(get_input "  Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
-      if [ "$(echo $getyn | grep -i "y")" ]; then
-         CHOWNHOMEDIR=$HME # set this to the home directory
-      fi
-    fi
-  else
-    unset needinput
-  fi
-done           
-HME="-d ${HME}"  
-    
-#: Get the new user's shell :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  unset got_error
-  SHL="$(get_input "Shell [ ${defshell} ]")"
-  if [ -z "$SHL" ]; then
-    SHL="${defshell}"
-  fi 
-  # Warn the user if the shell doesn't exist in /etc/shells or as a file
-  if [ -z "$(grep "^${SHL}$" $sfile)" ]; then
-    echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
-    got_error=yes
-  fi
-  if [ ! -f "$SHL" ]; then
-    echo "- Warning: ${SHL} does not exist as a file"
-    got_error=yes
-  fi
-  if [ ! -z "$got_error" ]; then
-    getyn="$(get_input "  Do you wish to change the shell ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-    fi
-  else
-    unset needinput
-  fi
-done           
-SHL="-s ${SHL}"
-
-#: Get the expiry date :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
-  if [ ! -z "$EXP" ]; then
-    # Check to see whether the expiry date is in the valid format
-    if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
-      echo "- That is not a valid expiration date"
-    else
-      unset needinput 
-      EXP="-e ${EXP}" 
-    fi
-  else
-    unset needinput
-  fi
-done
-
-# Display the info about the new impending account
-echo
-echo "New account will be created as follows:"
-echo
-echo "---------------------------------------"
-display "Login name.......: " "$LOGIN"
-display "UID..............: " "$_UID" "[ Next available ]"
-display "Initial group....: " "$GID"
-display "Additional groups: " "$AGID" "[ None ]"
-display "Home directory...: " "$HME"
-display "Shell............: " "$SHL"
-display "Expiry date......: " "$EXP" "[ Never ]"
-echo
-
-echo "This is it... if you want to bail out, hit Control-C.  Otherwise, press"
-echo "ENTER to go ahead and make the account."
-read junk
-
-echo
-echo "Creating new account..."
-echo
-echo
-
-# Add the account to the system
-CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
-$CMD
-
-if [ $? -gt 0 ]; then
-  echo "- Error running useradd command -- account not created!"
-  echo "(cmd: $CMD)"
-  exit 1
-fi
-
-# chown the home dir ?  We can only do this once the useradd has
-# completed otherwise the user name doesn't exist.
-if [ ! -z "${CHOWNHOMEDIR}" ]; then
-  chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
-fi
-
-# Set the finger information
-$chfn "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "- Warning: an error occurred while setting finger information"
-fi
-
-# Set a password
-$passwd "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "* WARNING: An error occured while setting the password for"
-  echo "           this account.  Please manually investigate this *"
-  exit 1
-fi
-
-echo
-echo
-echo "Account setup complete."
-exit 0
-
diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd
deleted file mode 100644
index 8f49f5cc8..000000000
--- a/testing/shadow/chgpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-account		required	pam_permit.so
-password	include		system-auth
diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/chpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so sha512 shadow
diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/testing/shadow/defaults.pam
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs
deleted file mode 100644
index 2500ee447..000000000
--- a/testing/shadow/login.defs
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-#
-# Delay in seconds before being allowed another attempt after a login failure
-#
-FAIL_DELAY		3
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-LOG_UNKFAIL_ENAB	no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS		no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB		yes
-SYSLOG_SG_ENAB		yes
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-CONSOLE		/etc/securetty
-#CONSOLE	console:tty01:tty02:tty03:tty04
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE	/var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE	/etc/ttytype
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME		su
-
-#
-# *REQUIRED*
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
-#   QMAIL_DIR is for Qmail
-#
-#QMAIL_DIR	Maildir
-MAIL_DIR	/var/spool/mail
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE	.hushlogin
-#HUSHLOGIN_FILE	/etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH	PATH=/bin:/usr/bin
-
-#
-# Terminal permissions
-#
-#	TTYGROUP	Login tty will be assigned this group ownership.
-#	TTYPERM		Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-TTYGROUP	tty
-TTYPERM		0600
-
-#
-# Login configuration initializations:
-#
-#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
-#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
-#	UMASK		Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# The ULIMIT is used only if the system supports it.
-# (now it works with setrlimit too; ulimit is in 512-byte units)
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR	0177
-KILLCHAR	025
-UMASK		077
-
-#
-# Password aging controls:
-#
-#	PASS_MAX_DAYS	Maximum number of days a password may be used.
-#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
-#	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN			 1000
-UID_MAX			60000
-# System accounts
-SYS_UID_MIN		  500
-SYS_UID_MAX		  999
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN			 1000
-GID_MAX			60000
-# System accounts
-SYS_GID_MIN		  500
-SYS_GID_MAX		  999
-
-#
-# Max number of login retries if password is bad
-#
-LOGIN_RETRIES		5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT		60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT		rwh
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-#CONSOLE_GROUPS		floppy:audio:cdrom
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default in no.
-#
-DEFAULT_HOME	yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
-# Enable setting of the umask group bits to be the same as owner bits
-# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
-# the same as gid, and username is the same as the primary group name.
-#
-# This also enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB yes
-
diff --git a/testing/shadow/newusers b/testing/shadow/newusers
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/newusers
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so sha512 shadow
diff --git a/testing/shadow/passwd b/testing/shadow/passwd
deleted file mode 100644
index ab56da496..000000000
--- a/testing/shadow/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-#password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password	required	pam_unix.so sha512 shadow use_authtok
-password	required	pam_unix.so sha512 shadow nullok
diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch
deleted file mode 100644
index 5aba8fa01..000000000
--- a/testing/shadow/shadow-strncpy-usage.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c
---- shadow-4.1.5/src/usermod.c.orig	2012-02-13 08:19:43.792146449 -0500
-+++ shadow-4.1.5/src/usermod.c	2012-02-13 08:21:19.375114500 -0500
-@@ -182,7 +182,7 @@
- 	struct tm *tp;
- 
- 	if (date < 0) {
--		strncpy (buf, "never", maxsize);
-+		strncpy (buf, "never", maxsize - 1);
- 	} else {
- 		time_t t = (time_t) date;
- 		tp = gmtime (&t);
-diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c
---- shadow-4.1.5/src/login.c.orig	2012-02-13 08:19:50.951994454 -0500
-+++ shadow-4.1.5/src/login.c	2012-02-13 08:21:04.490430937 -0500
-@@ -752,7 +752,8 @@
- 			          _("%s login: "), hostn);
- 		} else {
- 			strncpy (loginprompt, _("login: "),
--			         sizeof (loginprompt));
-+			         sizeof (loginprompt) - 1);
-+			loginprompt[sizeof (loginprompt) - 1] = '\0';
- 		}
- 
- 		retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);
diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily
deleted file mode 100755
index 1931a793e..000000000
--- a/testing/shadow/shadow.cron.daily
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
-
diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install
deleted file mode 100644
index 14384c333..000000000
--- a/testing/shadow/shadow.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  grpck -r >/dev/null 2>&1
-  if [ $? -eq 2 ]; then
-    printf '%s\n' \
-      "==> Warning: /etc/group or /etc/gshadow are inconsistent." \
-      "    Run 'grpck' to correct this."
-  fi
-  return 0
-}
diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults
deleted file mode 100644
index b800b1777..000000000
--- a/testing/shadow/useradd.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# useradd defaults file for ArchLinux
-# original changes by TomK
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
-CREATE_MAIL_SPOOL=no
diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch
deleted file mode 100644
index bce434264..000000000
--- a/testing/shadow/xstrdup.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- shadow-4.1.2.1/libmisc/xmalloc.c	2008-08-30 21:55:44.000000000 -0500
-+++ shadow-4.1.2.1/libmisc/xmalloc.c.new	2008-08-30 21:55:36.000000000 -0500
-@@ -61,5 +61,6 @@
- 
- char *xstrdup (const char *str)
- {
-+	if(str == NULL) return NULL;
- 	return strcpy (xmalloc (strlen (str) + 1), str);
- }
diff --git a/testing/sip/PKGBUILD b/testing/sip/PKGBUILD
deleted file mode 100644
index 4d9a1675c..000000000
--- a/testing/sip/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 168883 2012-10-16 11:55:44Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
-
-pkgbase=sip
-pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-makedepends=('python' 'python2')
-source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('9a48ad975e04ac824188840ea498ac32')
-
-build() {
-  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
-
-  cd ${pkgbase}-${pkgver}
-  python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-  
-  ### Python2 version ###
-  cd ../python2-${pkgbase}-${pkgver}
-  python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-}
-
-package_sip() {
-  pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
-  depends=('glibc')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C sipgen
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python-sip() {
-  pkgdesc="Python 3.x SIP bindings for C and C++ libraries"
-  depends=('sip' 'python')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C siplib
-  
-  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py
-  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py
-  
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-sip() {
-  pkgdesc="Python 2.x SIP bindings for C and C++ libraries"
-  depends=('sip' 'python2')
-
-  cd python2-${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C siplib
-  
-  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
-  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py
-  
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/slim/PKGBUILD b/testing/slim/PKGBUILD
deleted file mode 100644
index 3aa5a9f1b..000000000
--- a/testing/slim/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 169287 2012-10-18 19:49:16Z jgc $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-
-pkgname=slim
-pkgver=1.3.4
-pkgrel=4
-pkgdesc='Desktop-independent graphical login manager for X11'
-arch=('i686' 'x86_64')
-url='http://slim.berlios.de/'
-license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
-makedepends=('cmake' 'freeglut')
-backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'pam.d'
-        'logrotate'
-        'slim.service'
-        'session-name.patch'
-        'libpng-1.4+-support.patch'
-        'fix-glibc-segfault-1.3.4.patch')
-
-build() {
-        cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-        patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
-        patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864
-        cd ${srcdir}
-        mkdir build
-        cd build
-        cmake ../${pkgbase}-${pkgver} \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_SKIP_RPATH=ON \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DUSE_PAM=yes -DUSE_CONSOLEKIT=no
-	make
-}
-
-package() {
-        cd  ${srcdir}/build/
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
-	install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
-	install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim
-
-	# Provide sane defaults
-	sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
-	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
-        # install systemd files
-        install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
-}
-md5sums=('51543533e492b41007811f7d880720fa'
-         'd8ea9c4dee2811524b67f4f666311a1f'
-         '37ef35079139544d04b8316c7f66f754'
-         '43da096480bf72c3ccec8ad8400f34f0'
-         'a5d6bde9e63899df7d2081e1585bbe54'
-         'ebcb6829028615686de7b64ceeaaf8ed'
-         '6d19bd7a91592ed2bb902b22b9594565'
-         '9efc4e0d82d354f0c578be7723870769')
diff --git a/testing/slim/fix-glibc-segfault-1.3.4.patch b/testing/slim/fix-glibc-segfault-1.3.4.patch
deleted file mode 100644
index b035f8a78..000000000
--- a/testing/slim/fix-glibc-segfault-1.3.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: app.cpp
-===================================================================
---- app.cpp	(revision 223)
-+++ app.cpp	(working copy)
-@@ -593,7 +593,7 @@
- 
-         n++;
- 
--        child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-+        child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
-         memcpy(child_env, old_env, sizeof(char*)*n);
-         child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
-         child_env[n] = NULL;
diff --git a/testing/slim/libpng-1.4+-support.patch b/testing/slim/libpng-1.4+-support.patch
deleted file mode 100644
index 57b39272b..000000000
--- a/testing/slim/libpng-1.4+-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
-                                 (png_infopp) NULL);
-     }
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
-     if (setjmp(png_ptr->jmpbuf)) {
-+#endif
-         goto png_destroy;
-     }
- 
diff --git a/testing/slim/logrotate b/testing/slim/logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/testing/slim/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/testing/slim/pam.d b/testing/slim/pam.d
deleted file mode 100644
index 59db5a8c5..000000000
--- a/testing/slim/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
--session	optional	pam_systemd.so
diff --git a/testing/slim/rc.d b/testing/slim/rc.d
deleted file mode 100755
index b0be7ffc5..000000000
--- a/testing/slim/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
-  start)
-    stat_busy "Starting Simple Login Manager"
-    [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon slim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Simple Login Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/slim/session-name.patch b/testing/slim/session-name.patch
deleted file mode 100644
index 8211c4f72..000000000
--- a/testing/slim/session-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp	2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp	2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
-     Root = root;
-     cfg = config;
- 
--    session = "";
-+    session = cfg->nextSession(session);
- 
-     // Init GC
-     XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
- 
- void Panel::ClearPanel() {
--    session = "";
-+    session = cfg->nextSession(session);
-     Reset();
-     XClearWindow(Dpy, Root);
-     XClearWindow(Dpy, Win);
diff --git a/testing/slim/slim.service b/testing/slim/slim.service
deleted file mode 100644
index b894085a0..000000000
--- a/testing/slim/slim.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/testing/slim/tty-slowness.patch b/testing/slim/tty-slowness.patch
deleted file mode 100644
index c590fbed8..000000000
--- a/testing/slim/tty-slowness.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp	2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
-         signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
--        OpenLog();
--        
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-             daemonmode = true;
-         }
- 
-         // Daemonize
-         if (daemonmode) {
--            if (daemon(0, 1) == -1) {
-+            if (daemon(0, 0) == -1) {
-                 cerr << APPNAME << ": " << strerror(errno) << endl;
-                 exit(ERR_EXIT);
-             }
--            UpdatePid();
-         }
- 
-+        OpenLog();
-+
-+        if (daemonmode) UpdatePid();
-+
-         CreateServerAuth();
-         StartServer();
-         alarm(2);
diff --git a/testing/smartmontools/PKGBUILD b/testing/smartmontools/PKGBUILD
deleted file mode 100644
index 1cb08bd73..000000000
--- a/testing/smartmontools/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 161937 2012-06-16 17:16:57Z dreisner $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Jani Talikka <jani.talikka@gmail.com>
-# Contributor: Ralf Barth <archlinux.org@haggy.org>
-
-pkgname=smartmontools
-pkgver=5.42
-pkgrel=4
-pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
-url="http://smartmontools.sourceforge.net"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libcap-ng' 'bash')
-backup=('etc/smartd.conf'
-        'etc/conf.d/smartd')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'smartd.conf'
-        'smartd.rc')
-md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a'
-         '28c1b80c41dac52d433961dcfb4f70e0'
-         'fb30e07f87f2c1d99532e018291ad3e8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --enable-drivedb \
-              --with-libcap-ng=yes \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e "s:sysconfig/smartmontools:conf.d/smartd:g" smartd.service
-  sed -i -e "s:smartd_opts:SMARTD_ARGS:g" smartd.service
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf ${pkgdir}/etc/rc.d
-  install -Dm755 ${srcdir}/smartd.rc "${pkgdir}/etc/rc.d/smartd"
-  install -Dm644 ${srcdir}/smartd.conf "${pkgdir}/etc/conf.d/smartd"
-}
diff --git a/testing/smartmontools/smartd.conf b/testing/smartmontools/smartd.conf
deleted file mode 100644
index f14870abf..000000000
--- a/testing/smartmontools/smartd.conf
+++ /dev/null
@@ -1 +0,0 @@
-SMARTD_ARGS=""
diff --git a/testing/smartmontools/smartd.rc b/testing/smartmontools/smartd.rc
deleted file mode 100755
index 16920db12..000000000
--- a/testing/smartmontools/smartd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-SMARTD_ARGS=
-[ -f /etc/conf.d/smartd ] && . /etc/conf.d/smartd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-
-   start)
-     stat_busy "Starting smartd"
-     /usr/sbin/smartd ${SMARTD_ARGS} &>/dev/null
-     if [ $? -ne 0 ]; then
-       stat_fail
-     else
-       add_daemon smartd
-       stat_done
-     fi
-   ;;
-
-   stop)
-     stat_busy "Stopping smartd"
-     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
-     rm_daemon smartd
-     stat_done
-   ;;
-
-   restart)
-     stat_busy "Restarting smartd ..."
-     $0 stop
-     $0 start
-     stat_done
-   ;;
-
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/smpeg/PKGBUILD b/testing/smpeg/PKGBUILD
deleted file mode 100644
index 96b7420ee..000000000
--- a/testing/smpeg/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168278 2012-10-07 17:15:25Z heftig $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=smpeg
-pkgver=0.4.4
-pkgrel=7
-pkgdesc="SDL MPEG Player Library"
-arch=('i686' 'x86_64')
-url="http://icculus.org/smpeg/"
-license=('LGPL')
-depends=('sdl')
-makedepends=('gtk' 'mesa' 'glu')
-optdepends=('gtk: to use gtv ' 'glu: to use glmovie')
-options=('!libtool' '!makeflags')
-source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz
-        smpeg-0.4.4-gcc41.patch)
-md5sums=('59c76ac704088ef5539210190c4e1fe3'
-         '8b979a58307d7196655758bd3d2466c4')
-sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259'
-          '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
-  make LDFLAGS+=-lstdc++
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  # fix aclocal warnings
-  sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4
-}
diff --git a/testing/smpeg/smpeg-0.4.4-gcc41.patch b/testing/smpeg/smpeg-0.4.4-gcc41.patch
deleted file mode 100644
index 4a0eeb453..000000000
--- a/testing/smpeg/smpeg-0.4.4-gcc41.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: MPEGaudio.h
-===================================================================
-RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
-retrieving revision 1.23
-diff -u -p -r1.23 MPEGaudio.h
---- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
-+++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
-@@ -151,12 +151,6 @@ private:
- /* The actual MPEG audio class */
- class MPEGaudio : public MPEGerror, public MPEGaudioaction {
- 
--    friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
--    friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
--#ifdef THREADED_AUDIO
--    friend int Decode_MPEGaudio(void *udata);
--#endif
--
- public:
-     MPEGaudio(MPEGstream *stream, bool initSDL = true);
-     virtual ~MPEGaudio();
-@@ -367,6 +361,20 @@ public:
- #define N_TIMESTAMPS 5
- 
-   double timestamp[N_TIMESTAMPS];
-+
-+  /* Functions which access MPEGaudio internals */
-+  friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
-+  friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
-+#ifdef THREADED_AUDIO
-+  friend int Decode_MPEGaudio(void *udata);
-+#endif
- };
- 
-+/* Need to duplicate the prototypes, this is not a typo :) */
-+void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
-+int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
-+#ifdef THREADED_AUDIO
-+int Decode_MPEGaudio(void *udata);
-+#endif
-+
- #endif /* _MPEGAUDIO_H_ */
diff --git a/testing/sonata/PKGBUILD b/testing/sonata/PKGBUILD
deleted file mode 100644
index 17bb77c02..000000000
--- a/testing/sonata/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168892 2012-10-16 12:14:00Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=sonata
-pkgver=1.6.2.1
-pkgrel=8
-pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
-url="http://sonata.berlios.de/"
-license=('GPL3')
-depends=('pygtk' 'python2-mpd')
-optdepends=('gnome-python-extras: Enhanced system tray support'
-            'tagpy: Metadata editing support'
-            'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
-        info.py.patch)
-md5sums=('0b912325e7175abad3bf6c0edc071e05'
-         '595fcf7615035829b264afecb5a1beeb')
-
-build() {
-  cd "$srcdir/${pkgname}-$pkgver"
-  patch -Np0 -i "$srcdir/info.py.patch"
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
-}
-
-package() {
-  cd "$srcdir/${pkgname}-$pkgver"
-  python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
-}
diff --git a/testing/sonata/info.py.patch b/testing/sonata/info.py.patch
deleted file mode 100644
index e95cc3a08..000000000
--- a/testing/sonata/info.py.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- sonata/info.py	2011-07-05 22:32:08.452556016 -0500
-+++ sonata/info.py	2011-07-05 22:45:50.849311466 -0500
-@@ -393,9 +393,9 @@
- 				if content.startswith("#REDIRECT [["):
- 					addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
- 					content = urllib.urlopen(addr).read()
--				lyrics = content.split("&lt;lyrics&gt;")[1].split("&lt;/lyrics&gt;")[0]
--				if lyrics.strip() != "&lt;!-- PUT LYRICS HERE (and delete this entire line) --&gt;":
--					lyrics = misc.unescape_html(lyrics)
-+				content = misc.unescape_html(content)
-+				lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
-+				if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
- 					lyrics = misc.wiki_to_html(lyrics)
- 					lyrics = lyrics.decode("utf-8")
- # Save lyrics to file:
diff --git a/testing/soprano/PKGBUILD b/testing/soprano/PKGBUILD
deleted file mode 100644
index 798cbb5f4..000000000
--- a/testing/soprano/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 164625 2012-08-01 14:43:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=soprano
-pkgver=2.8.0
-pkgrel=2
-pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
-arch=('i686' 'x86_64')
-url='http://soprano.sourceforge.net/'
-license=('GPL' 'LGPL')
-depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base')
-makedepends=('cmake' 'openjdk6' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('273c3403aeb6d8a43e78a4887f50a385')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  . /etc/profile.d/openjdk6.sh
-  # we need the rpath
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSOPRANO_DISABLE_CLUCENE_INDEX=ON
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/source-highlight/PKGBUILD b/testing/source-highlight/PKGBUILD
deleted file mode 100644
index d462c7fa0..000000000
--- a/testing/source-highlight/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 163554 2012-07-15 13:17:27Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=source-highlight
-pkgver=3.1.7
-pkgrel=2
-pkgdesc="Convert source code to syntax highlighted document"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/src-highlite/"
-license=('GPL')
-depends=('bash' 'boost-libs')
-makedepends=('ctags' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0ff81588d3536b4c4e571122ba940595')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-	      --with-bash-completion=${pkgdir}/usr/share/bash-completion/completions
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/testing/source-highlight/source-highlight.install b/testing/source-highlight/source-highlight.install
deleted file mode 100644
index 4fd1b3005..000000000
--- a/testing/source-highlight/source-highlight.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=usr/share/info
-info_files=(source-highlight.info source-highlight-lib.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/sox/PKGBUILD b/testing/sox/PKGBUILD
deleted file mode 100644
index 8613aa777..000000000
--- a/testing/sox/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 163066 2012-07-06 15:22:11Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sox
-pkgver=14.4.0
-pkgrel=3
-pkgdesc="The Swiss Army knife of sound processing tools"
-arch=('i686' 'x86_64')
-url="http://sox.sourceforge.net/"
-license=('GPL' 'LGPL')
-depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
-checkdepends=('time')
-optdepends=('libao: for ao plugin'
-            'ffmpeg: for ffmpeg plugin'
-            'libmad: for mp3 plugin'
-            'libid3tag: for mp3 plugin'
-            'wavpack: for wavpack plugin'
-            'libpulse: for pulse plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        sox_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch)
-sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
-          'ab304f1fc17269262dbc4977aa9b7e97ec805ae4'
-          '2f92bcaebcaf300782396f106cdd27c72048a851')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch"
-  patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch"
-  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-dyn-default --with-distro="Arch Linux"
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make bindir=. installcheck
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/sox/sox-ffmpeg0.11.patch b/testing/sox/sox-ffmpeg0.11.patch
deleted file mode 100644
index 901c81582..000000000
--- a/testing/sox/sox-ffmpeg0.11.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure
---- sox-14.4.0-orig/configure	2012-06-12 00:35:53.462360803 -0400
-+++ sox-14.4.0/configure	2012-06-12 00:36:08.572361294 -0400
-@@ -15781,9 +15781,9 @@
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5
--$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
--if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5
-+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }
-+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -15797,27 +15797,27 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char av_open_input_file ();
-+char avformat_open_input ();
- int
- main ()
- {
--return av_open_input_file ();
-+return avformat_open_input ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_avformat_av_open_input_file=yes
-+  ac_cv_lib_avformat_avformat_open_input=yes
- else
--  ac_cv_lib_avformat_av_open_input_file=no
-+  ac_cv_lib_avformat_avformat_open_input=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5
--$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }
--if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5
-+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }
-+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :
-   for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
---- sox-14.4.0-orig/src/ffmpeg.c	2012-06-12 00:35:53.459027469 -0400
-+++ sox-14.4.0/src/ffmpeg.c	2012-06-12 00:36:26.539028545 -0400
-@@ -93,7 +93,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   enc->error_resilience = 1;
- #else
--  enc->error_recognition = 1;
-+  enc->err_recognition = 1;
- #endif
- 
-   if (!codec || avcodec_open(enc, codec) < 0)
-@@ -157,7 +157,7 @@
- static int startread(sox_format_t * ft)
- {
-   priv_t * ffmpeg = (priv_t *)ft->priv;
--  AVFormatParameters params;
-+  AVDictionary *params;
-   int ret;
-   int i;
- 
-@@ -172,7 +172,7 @@
- 
-   /* Open file and get format */
-   memset(&params, 0, sizeof(params));
--  if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, &params)) < 0) {
-+  if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, &params)) < 0) {
-     lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret);
-     return SOX_EOF;
-   }
-@@ -231,7 +231,7 @@
-     /* If input buffer empty, read more data */
-     if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
-       if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
--	  (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
-+	  (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))
- 	break;
-       ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
-       ffmpeg->audio_buf_index = 0;
-@@ -373,13 +373,6 @@
-       return SOX_EOF;
-   }
- 
--  /* set the output parameters (must be done even if no
--     parameters). */
--  if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
--    lsx_fail("ffmpeg invalid output format parameters");
--    return SOX_EOF;
--  }
--
-   /* Next line for debugging */
-   /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
- 
-@@ -391,14 +384,14 @@
- 
-   /* open the output file, if needed */
-   if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
--    if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
-+    if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
-       lsx_fail("ffmpeg could not open `%s'", ft->filename);
-       return SOX_EOF;
-     }
-   }
- 
-   /* write the stream header, if any */
--  av_write_header(ffmpeg->ctxt);
-+  avformat_write_header(ffmpeg->ctxt, NULL);
- 
-   return SOX_SUCCESS;
- }
-@@ -478,7 +471,7 @@
- #if (LIBAVFORMAT_VERSION_INT < 0x340000)
-     url_fclose(&ffmpeg->ctxt->pb);
- #else
--    url_fclose(ffmpeg->ctxt->pb);
-+    avio_close(ffmpeg->ctxt->pb);
- #endif
-   }
- 
diff --git a/testing/sox/sox_default_audio_driver_fallback.patch b/testing/sox/sox_default_audio_driver_fallback.patch
deleted file mode 100644
index 9f9060e17..000000000
--- a/testing/sox/sox_default_audio_driver_fallback.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/sox.c.old	2012-05-06 22:45:45.380564154 -0400
-+++ src/sox.c	2012-05-06 22:47:11.948248987 -0400
-@@ -2538,20 +2538,38 @@
-   return name? from_env? from_env : name : NULL;
- }
- 
-+static char const * try_device(char const * name)
-+{
-+  sox_format_handler_t const * handler = sox_find_format(name, sox_false);
-+  if (handler) {
-+    sox_format_t format, * ft = &format;
-+    memset(ft, 0, sizeof(*ft));
-+    ft->filename = (char *)device_name(name);
-+    ft->priv = lsx_calloc(1, handler->priv_size);
-+    if (handler->startwrite(ft) == SOX_SUCCESS) {
-+      handler->stopwrite(ft);
-+      free(ft->priv);
-+      return name;
-+    }
-+    free(ft->priv);
-+  }
-+  return NULL;
-+}
-+
- static char const * set_default_device(file_t * f)
- {
-   /* Default audio driver type in order of preference: */
-   if (!f->filetype) f->filetype = getenv("AUDIODRIVER");
--  if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = "coreaudio";
--  if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype = "pulseaudio";
--  if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = "alsa";
--  if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = "waveaudio";
--  if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = "sndio";
--  if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss";
--  if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = "sunau";
--  if (!f->filetype && sox_find_format("ao"  , sox_false) && file_count) /*!rec*/
--    f->filetype = "ao";
--
-+  if (!f->filetype) f->filetype = try_device("coreaudio");
-+  if (!f->filetype) f->filetype = try_device("pulseaudio");
-+  if (!f->filetype) f->filetype = try_device("alsa");
-+  if (!f->filetype) f->filetype = try_device("waveaudio");
-+  if (!f->filetype) f->filetype = try_device("sndio");
-+  if (!f->filetype) f->filetype = try_device("oss");
-+  if (!f->filetype) f->filetype = try_device("sunau");
-+  if (!f->filetype && file_count) /*!rec*/
-+    f->filetype = try_device("ao");
-+ 
-   if (!f->filetype) {
-     lsx_fail("Sorry, there is no default audio device configured");
-     exit(1);
diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD
deleted file mode 100644
index 18a912f3a..000000000
--- a/testing/spamassassin/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 165766 2012-08-29 13:17:22Z bluewind $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.3.2
-pkgrel=6
-pkgdesc="A mail filter to identify spam."
-arch=('i686' 'x86_64')
-license=('APACHE')
-url="http://spamassassin.apache.org"
-depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
-         'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
-         'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
-makedepends=('razor' 'perl-dbi') 
-optdepends=('razor: to identify collaborately-flagged spam')
-backup=('etc/conf.d/spamd' 
-        'etc/mail/spamassassin/local.cf'
-        'etc/mail/spamassassin/init.pre'
-        'etc/mail/spamassassin/v310.pre'
-        'etc/mail/spamassassin/v312.pre'
-        'etc/mail/spamassassin/v320.pre'
-        'etc/mail/spamassassin/v330.pre')
-install="${pkgname}.install"
-options=('!emptydirs')
-source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"
-        'spamd.conf.d' 'spamd' 'spamassassin.service')
-md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
-         'af501c6b0bb937a2775b747cc4b6d150'
-         '57545e6877503d897db21e9a2e8bd2b9'
-         '1c39572b79bc20c822387814050ee5c1')
-
-build() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
-      CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no
-  make 
-}
-
-check() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  # SSLv2 is disabled by upstream so this test would fail
-  rm -rf t/spamd_ssl_v2.t
-
-  # parallel tests cause lots of failures; disable for now
-  #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
-
-  make test
-}
-
-package() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd"
-  install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd"
-  install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
-}
diff --git a/testing/spamassassin/spamassassin.install b/testing/spamassassin/spamassassin.install
deleted file mode 100644
index e43453e97..000000000
--- a/testing/spamassassin/spamassassin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  echo "You must run 'sa-update' to install spam rules before use."
-}
-
-post_upgrade() {
-  # Compile rules, if rules have previously been compiled, and it's possible
-  if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
-    echo "Detected compiled rules, running sa-compile..."
-    sa-compile > /dev/null 2>&1
-fi
-}
diff --git a/testing/spamassassin/spamassassin.service b/testing/spamassassin/spamassassin.service
deleted file mode 100644
index a74f6e644..000000000
--- a/testing/spamassassin/spamassassin.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/spamd.pid
-ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/spamassassin/spamd b/testing/spamassassin/spamd
deleted file mode 100644
index 3fb97566e..000000000
--- a/testing/spamassassin/spamd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE=/var/run/spamd.pid
-if [ -f $PIDFILE ]; then
-  PID=$(cat $PIDFILE)
-else
-  PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting spamd"
-    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon spamd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping spamd"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      # Some users report that a second attempt at stopping the process
-      # works.  So, take a little nap and give it another whirl...
-      sleep 2
-      kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon spamd
-        stat_done
-      fi
-    else
-      rm_daemon spamd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/spamassassin/spamd.conf.d b/testing/spamassassin/spamd.conf.d
deleted file mode 100644
index 4295e0073..000000000
--- a/testing/spamassassin/spamd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-SPAMD_OPTS="-c"
diff --git a/testing/squid/PKGBUILD b/testing/squid/PKGBUILD
deleted file mode 100644
index 6620d2ffd..000000000
--- a/testing/squid/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 161938 2012-06-16 17:17:12Z dreisner $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=squid
-pkgver=3.1.20
-pkgrel=2
-pkgdesc="A full-featured Web proxy cache server."
-arch=('i686' 'x86_64')
-url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
-makedepends=('libcap')
-license=('GPL')
-backup=('etc/squid/squid.conf'
-        'etc/squid/mime.conf'
-        'etc/conf.d/squid')
-install=squid.install
-source=("http://www.squid-cache.org/Versions/v3/3.1/$pkgname-$pkgver.tar.bz2"
-        'squid'
-        'squid.conf.d'
-        'squid.pam'
-        'squid.cron'
-        'squid.service')
-md5sums=('c4d733a383c0508fd0746d64a2d7278a'
-         '02f7b5bd793f778e40834fd6457d2199'
-         '2383772ef94efddc7b920628bc7ac5b0'
-         '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # gcc 4.6 doesn't support -fhuge-objects.
-  sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
-
-  # fix cache_dir, cache_dir size, and effective group.
-  sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
-  sed '/^#cache_dir/ s/100/256/
-       /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
-
-  ./configure \
-      --prefix=/usr \
-      --datadir=/usr/share/squid \
-      --sysconfdir=/etc/squid \
-      --libexecdir=/usr/lib/squid \
-      --localstatedir=/var \
-      --with-logdir=/var/log/squid \
-      --with-pidfile=/run/squid.pid \
-      --enable-auth="basic,digest,ntlm" \
-      --enable-removal-policies="lru,heap" \
-      --enable-digest-auth-helpers="password" \
-      --enable-storeio="aufs,ufs,diskd" \
-      --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
-      --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
-      --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
-      --enable-delay-pools \
-      --enable-arp-acl \
-      --enable-ssl \
-      --enable-snmp \
-      --enable-linux-netfilter \
-      --enable-ident-lookups \
-      --enable-useragent-log \
-      --enable-cache-digests \
-      --enable-referer-log \
-      --enable-arp-acl \
-      --enable-htcp \
-      --enable-carp \
-      --enable-epoll \
-      --with-filedescriptors=4096 \
-      --with-large-files \
-      --enable-arp-acl \
-      --with-default-user=proxy \
-      --enable-async-io \
-      --enable-truncate
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid
-  install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid
-  install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid
-  install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid
-
-  install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service"
-
-  # random unneeded empty dir...
-  rmdir "$pkgdir/usr/include"
-}
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/squid/squid b/testing/squid/squid
deleted file mode 100644
index da5534427..000000000
--- a/testing/squid/squid
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/squid.pid
-{ read -r PID </run/squid.pid; } 2>/dev/null
-if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then
-  rm /run/squid.pid
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting squid"
-    if [[ $PID ]] || ! squid $SQUID_ARGS; then
-      stat_fail
-    else
-      add_daemon squid
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping squid"
-    if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
-      stat_fail
-    else
-      # squid takes forever to shutdown all its listening FDs
-      while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
-        stat_append "."
-        sleep 3
-      done
-      rm_daemon squid
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/squid/squid.conf.d b/testing/squid/squid.conf.d
deleted file mode 100644
index ea248b76c..000000000
--- a/testing/squid/squid.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"
diff --git a/testing/squid/squid.cron b/testing/squid/squid.cron
deleted file mode 100644
index c78e51105..000000000
--- a/testing/squid/squid.cron
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# exit without error if no pidfile exists
-{ read pid </run/squid.pid; } 2>/dev/null || exit 0
-
-# make sure found PID really is a squid process
-if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
-  /usr/sbin/squid -k rotate
-fi
diff --git a/testing/squid/squid.install b/testing/squid/squid.install
deleted file mode 100644
index e7aa5ff68..000000000
--- a/testing/squid/squid.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupadd -g 15 proxy &>/dev/null
-  fi
-
-  id proxy &>/dev/null || \
-    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
-
-  chown proxy.proxy var/{cache,log}/squid
-
-#  cat << EOF
-#Release notes:  http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
-#EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/userdel proxy &> /dev/null
-  if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupdel proxy &>/dev/null
-  fi
-}
-
diff --git a/testing/squid/squid.pam b/testing/squid/squid.pam
deleted file mode 100644
index df8a8104f..000000000
--- a/testing/squid/squid.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#/etc/pam.d/squid
-#
-auth		required	pam_unix.so
-account		required	pam_unix.so
diff --git a/testing/squid/squid.service b/testing/squid/squid.service
deleted file mode 100644
index 9d41cc243..000000000
--- a/testing/squid/squid.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Web Proxy Cache Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/squid.pid
-ExecStart=/usr/sbin/squid -sYC
-ExecStop=/usr/sbin/squid -k shutdown
-ExecReload=/usr/sbin/squid -k reconfigure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/stellarium/PKGBUILD b/testing/stellarium/PKGBUILD
deleted file mode 100644
index 05a16e1e5..000000000
--- a/testing/stellarium/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 168495 2012-10-12 19:14:51Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=stellarium
-pkgver=0.11.4
-pkgrel=2
-pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
-arch=("i686" "x86_64")
-url="http://stellarium.free.fr/"
-license=('GPL2')
-depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	stellarium.desktop
-        stellarium.png)
-sha1sums=('5b8bfd71b4c3eabbc1db64b71221eeebe6785dbf'
-          'c9cc79212542238227b5bd6af99f60fe056f4ab2'
-          'b890d3b6c4dcfcfcc696514202af11b2a50c0fea')
-	
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
- 
-  make DESTDIR=${pkgdir} install
-
-  # install desktop file & pixmap
-  install -Dm644 ${srcdir}/stellarium.desktop \
-	${pkgdir}/usr/share/applications/stellarium.desktop
-  install -Dm644 ${srcdir}/stellarium.png \
-	${pkgdir}/usr/share/pixmaps/stellarium.png
-}
diff --git a/testing/stellarium/libpng14.patch b/testing/stellarium/libpng14.patch
deleted file mode 100644
index 7ed1da689..000000000
--- a/testing/stellarium/libpng14.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp
---- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp	2010-01-21 17:04:57.000000000 -0500
-+++ stellarium-0.10.2/src/core/StelTextureMgr.cpp	2010-01-21 17:06:55.000000000 -0500
-@@ -513,7 +513,7 @@
- 	fread (magic, 1, sizeof (magic), fp);
- 
- 	/* check for valid magic number */
--	if (!png_check_sig (magic, sizeof (magic)))
-+	if (png_sig_cmp (magic, 0, sizeof (magic)))
- 	{
- 		qWarning() << "error: \"" << filename << "\" is not a valid PNG image!";
- 		fclose (fp);
-@@ -576,7 +576,7 @@
- 	/* convert 1-2-4 bits grayscale images to 8 bits
- 	   grayscale. */
- 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
--		png_set_gray_1_2_4_to_8 (png_ptr);
-+		png_set_expand_gray_1_2_4_to_8 (png_ptr);
- 
- 	if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
- 		png_set_tRNS_to_alpha (png_ptr);
diff --git a/testing/stellarium/stellarium.desktop b/testing/stellarium/stellarium.desktop
deleted file mode 100644
index 1b82b18bd..000000000
--- a/testing/stellarium/stellarium.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Stellarium nightsky renderer
-GenericName=Nightsky renderer
-Comment=A real-time nightsky renderer
-Categories=Education;Science;Astronomy;
-Icon=stellarium
-Exec=stellarium
-Terminal=false
-Type=Application
diff --git a/testing/stellarium/stellarium.png b/testing/stellarium/stellarium.png
deleted file mode 100644
index 08bce127c..000000000
--- a/testing/stellarium/stellarium.png
+++ /dev/null
diff --git a/testing/strigi/PKGBUILD b/testing/strigi/PKGBUILD
deleted file mode 100644
index fe1e84d8b..000000000
--- a/testing/strigi/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 164683 2012-08-02 15:21:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=strigi
-pkgver=0.7.7
-pkgrel=2
-pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
-arch=('i686' 'x86_64')
-url='http://strigi.sourceforge.net/'
-license=('GPL2')
-depends=('exiv2' 'libxml2' 'boost-libs')
-makedepends=('qt' 'cmake' 'pkg-config' 'boost')
-optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
-            'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
-#source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'gcc47.patch')
-md5sums=('ca0a0fd5c2b99879f6330837aeede996'
-         '1acb9b31a4859dc427fc4d387fd8aa2f')
-
-build() {
-  pushd ${pkgname}-${pkgver}/strigidaemon
-  patch -p1 -i "${srcdir}"/gcc47.patch
-  popd
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_INOTIFY=ON \
-    -DENABLE_LOG4CXX=OFF \
-    -DENABLE_FAM=OFF \
-    -DENABLE_CLUCENE=OFF \
-    -DENABLE_CLUCENE_NG=OFF \
-    -DENABLE_FFMPEG=OFF
-  make
-}
-
-package() {
-  pushd build/libstreams
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/libstreamanalyzer
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/strigiclient/lib/searchclient/qtdbus
-  make DESTDIR="${pkgdir}" install
-  popd
-  
-  pushd build/strigiutils
-  make DESTDIR="${pkgdir}" install
-  popd
-}
diff --git a/testing/strigi/gcc47.patch b/testing/strigi/gcc47.patch
deleted file mode 100644
index d99582563..000000000
--- a/testing/strigi/gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Rex Dieter <rdieter@fedoraproject.org>
-Date: Mon, 09 Jan 2012 17:13:25 +0000
-Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep'
-X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&amp;a=commitdiff&amp;h=a8e97f672325557b3fbc84b987299350ec5ac10b
----
-gcc47 fix, unistd.h header required unconditionally for 'sleep'
----
-
-
---- a/bin/daemon/eventlistener/eventlistenerqueue.cpp
-+++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp
-@@ -27,9 +27,7 @@
- #include <iostream>
- #include <stdio.h>
- 
--#if defined(__SUNPRO_CC)
- #include <unistd.h>
--#endif
- 
- using namespace std;
- 
-
diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD
deleted file mode 100644
index 608580da8..000000000
--- a/testing/subversion/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# $Id: PKGBUILD 168385 2012-10-09 20:09:57Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=subversion
-pkgver=1.7.7
-pkgrel=1
-pkgdesc="A Modern Concurrent Version Control System"
-arch=('i686' 'x86_64')
-license=('APACHE')
-depends=('neon' 'apr-util' 'sqlite' 'file')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
-            'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts')
-makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
-             'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
-backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
-url="http://subversion.apache.org/"
-provides=('svn')
-options=('!makeflags' '!libtool' '!emptydirs')
-source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
-        svnserve
-        svn
-        svnserve.conf
-        svnserve.tmpfiles
-        svnserve.service
-        subversion-1.7.6-kwallet-gcc47.patch        
-        subversion.rpath.fix.patch)
-sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951'
-          '3df83e46277f0f08868236a6b6e6c0f0d7ef9278'
-          '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
-          '73b36c046c09cec2093354911c89e3ba8056af6c'
-          'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
-          '00cc36e69077a8c45674ead6dd62a7647b3a3b6d'
-          '9f6790d842cf3e0228b007483a43e39a42724068'
-          'aa0d01e606de2ebc5eed9c533d218d37a217c50c'
-          '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   export PYTHON=/usr/bin/python2
-
-   patch -p0 -i ../subversion.rpath.fix.patch
-   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
-
-   patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch
-
-   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
-               --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
-               --enable-javahl --with-gnome-keyring --with-kwallet
-
-   make external-all
-   make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
-   make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl #swig-rb
-}
-
-#check() {
-#   cd "${srcdir}/${pkgname}-${pkgver}"
-#   export LANG=C LC_ALL=C
-#   make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb
-#}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
-   make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
-     swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
-     install install-swig-py install-swig-pl install-javahl #install-swig-rb
-
-   install -dm755 "${pkgdir}"/usr/share/subversion
-   cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
-   rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
-
-   rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
-   rm -r "${pkgdir}"/usr/lib/perl5/core_perl
-
-   ## svnserve ...
-
-   # ... iniscript/xinetd
-   install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
-   install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
-
-   # ... systemd
-   install -D -m 644 "${srcdir}"/svnserve.service  "${pkgdir}"/usr/lib/systemd/system/svnserve.service
-   install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf
-
-   # ... common config
-   install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
-
-   install -Dm 644 tools/client-side/bash_completion \
-     "${pkgdir}"/usr/share/bash-completion/completions/subversion
-   for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
-      ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
-   done
-}
diff --git a/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch b/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch
deleted file mode 100644
index a571c3c3c..000000000
--- a/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp	2010-12-30 15:46:50.000000000 -0500
-+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp	2012-08-14 19:43:16.694275908 -0400
-@@ -60,6 +60,9 @@
- /* KWallet simple provider, puts passwords in KWallet                    */
- /*-----------------------------------------------------------------------*/
- 
-+static int q_argc = 1;
-+static char q_argv0[] = "svn"; // Build non-const char * from string constant
-+static char *q_argv[] = { q_argv0 };
- 
- static const char *
- get_application_name(apr_hash_t *parameters,
-@@ -175,6 +178,10 @@
-                    "kwallet-initialized",
-                    APR_HASH_KEY_STRING,
-                    NULL);
-+      apr_hash_set(parameters,
-+                   "kwallet-wallet",
-+                   APR_HASH_KEY_STRING,
-+                   NULL);
-     }
-   return APR_SUCCESS;
- }
-@@ -203,12 +210,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
-@@ -273,12 +279,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch
deleted file mode 100644
index ba6ee9e4e..000000000
--- a/testing/subversion/subversion.rpath.fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-02-16 14:10:48.000000000 -0200
-+++ Makefile.in	2009-06-04 00:56:29.000000000 -0300
-@@ -678,6 +678,7 @@
- 
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
- 	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
-+	cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}}
- 
- swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
-   $(SWIG_PL_DIR)/native/Makefile
diff --git a/testing/subversion/svn b/testing/subversion/svn
deleted file mode 100644
index 8988aaf63..000000000
--- a/testing/subversion/svn
+++ /dev/null
@@ -1,11 +0,0 @@
-service svn
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/bin/svnserve
-	server_args		= -i
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve
deleted file mode 100755
index 670fee742..000000000
--- a/testing/subversion/svnserve
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/svnserve
-
-PID=`pidof -o %PPID /usr/bin/svnserve`
-case "$1" in
-  start)
-    stat_busy "Starting svnserve"
-    if [ -z "$PID" ]; then 
-      if [ -n "$SVNSERVE_USER" ]; then
-        su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
-      else
-        /usr/bin/svnserve -d $SVNSERVE_ARGS &
-      fi
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon svnserve
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping svnserve"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon svnserve
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf
deleted file mode 100644
index 37fb7ea10..000000000
--- a/testing/subversion/svnserve.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Parameters to be passed to svnserve
-#
-#SVNSERVE_ARGS="-r /path/to/some/repos"
-SVNSERVE_ARGS=""
-
-#SVNSERVE_USER="svn"
diff --git a/testing/subversion/svnserve.service b/testing/subversion/svnserve.service
deleted file mode 100644
index d8a8e10c1..000000000
--- a/testing/subversion/svnserve.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Subversion protocol daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/svnserve
-ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/subversion/svnserve.tmpfiles b/testing/subversion/svnserve.tmpfiles
deleted file mode 100644
index e8487d373..000000000
--- a/testing/subversion/svnserve.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-D /run/svnserve 0700 root root -
diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD
deleted file mode 100644
index 9b0b56838..000000000
--- a/testing/sudo/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 166772 2012-09-18 20:41:58Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sudo
-_sudover=1.8.6p3
-pkgver=${_sudover/p/.p}
-pkgrel=1
-pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
-url="http://www.sudo.ws/sudo/"
-license=('custom')
-depends=('glibc' 'pam')
-backup=('etc/sudoers' 'etc/pam.d/sudo')
-options=('!libtool')
-source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz
-        sudo.pam)
-sha256sums=('8130df04268f678880c3f423337c56e7d437a0f508a46b1dfefae16b0b20c92e'
-            'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
-
-build() {
-  cd "$srcdir/$pkgname-$_sudover"
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --with-logfac=auth \
-    --with-pam \
-    --with-env-editor \
-    --with-passprompt="[sudo] password for %p: " \
-    --with-all-insults
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$_sudover"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_sudover"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
-
-  install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam
deleted file mode 100644
index 4e586cd22..000000000
--- a/testing/sudo/sudo.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
diff --git a/testing/sushi/PKGBUILD b/testing/sushi/PKGBUILD
deleted file mode 100644
index 1e00c9a59..000000000
--- a/testing/sushi/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169155 2012-10-18 19:22:40Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=sushi
-pkgver=3.6.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' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince')
-install=sushi.install
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('506f0f1f934e9e6c0f5584619c3f2ab0d5906248472ca1bf08a159504ad02f78')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/sushi
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/sushi/sushi.install b/testing/sushi/sushi.install
deleted file mode 100644
index c19349f72..000000000
--- a/testing/sushi/sushi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/swt/PKGBUILD b/testing/swt/PKGBUILD
deleted file mode 100644
index f6db69266..000000000
--- a/testing/swt/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 168272 2012-10-07 11:37:04Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
-pkgname=swt
-pkgver=4.2
-pkgrel=2
-_date=201206081400
-pkgdesc="An open source widget toolkit for Java"
-arch=('i686' 'x86_64')
-url="http://www.eclipse.org/swt/"
-license=('EPL')
-depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
-optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit')
-makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant')
-if [ "${CARCH}" = "i686" ]; then
-  _carch=x86
-  md5sums=('3efe0404f6129183abae46f7620fe14f'
-           '2f556ab534fc2488c6e8c0ee6c02825c')
-fi
-if [ "${CARCH}" = "x86_64" ]; then
-  _carch=x86_64
-  md5sums=('9e06b576116ff409f395571603582827'
-           '2f556ab534fc2488c6e8c0ee6c02825c')
-fi
-source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
-        build-swt.xml)
-# To test this pkg:
-# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
-
-build() {
-  cd ${srcdir}
-  unzip -oq src.zip -d src
-
-  . /etc/profile.d/jdk.sh
-  . /etc/profile.d/apache-ant.sh
-
-  # Shared objects
-  cd src
-  ./build.sh
-
-  # SWT jar
-  ant -f ../build-swt.xml compile
-}
-
-package() {
-  cd ${srcdir}/src
-
-  # Shared objects
-  export OUTPUT_DIR=${pkgdir}/usr/lib
-  install -dm755 ${OUTPUT_DIR} 
-  make -f make_linux.mak install
-
-  # SWT jar
-  ant -f ../build-swt.xml jar
-  install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar
-  ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar
-}
diff --git a/testing/swt/build-swt.xml b/testing/swt/build-swt.xml
deleted file mode 100644
index a161204f8..000000000
--- a/testing/swt/build-swt.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}" target="1.6" />
-   </target>
-
-   <target name="jar">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>
diff --git a/testing/system-config-printer/PKGBUILD b/testing/system-config-printer/PKGBUILD
deleted file mode 100644
index 6ee650101..000000000
--- a/testing/system-config-printer/PKGBUILD
+++ /dev/null
@@ -1,108 +0,0 @@
-# $Id: PKGBUILD 168898 2012-10-16 13:51:27Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=system-config-printer
-pkgname=('system-config-printer-common'
-         'system-config-printer-gnome')
-pkgver=1.3.11
-pkgrel=2
-pkgdesc="A CUPS printer configuration tool and status applet"
-url="http://cyberelk.net/tim/software/system-config-printer/"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl'
-             'libusb-compat' 'desktop-file-utils')
-source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
-md5sums=('081fde89686ee15a9433c0035f5faed0'
-         '470964eb627af31f2aff9967a4b9a5bb')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py')
-  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
-
-  # Fix build with udev 183
-  sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c
-
-  ./configure --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/etc \
-    --with-udev-rules
-
-  make
-}
-
-package_system-config-printer-common() {
-  pkgdesc='Pygtk CUPS Configuration'
-  depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat')
-  optdepends=('system-config-printer-gnome: for the GTK frontend'
-	'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
-  replaces=('system-config-printer')
-  provides=("system-config-printer=${pkgver}")
-  conflicts=('system-config-printer')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  install -d "${pkgdir}"/usr/share/${pkgbase}
-  install -m644 config.py \
-    debug.py \
-    installpackage.py \
-    monitor.py \
-    PhysicalDevice.py \
-    ppdippstr.py \
-    probe_printer.py \
-    SearchCriterion.py \
-    smburi.py \
-    statereason.py \
-    "${pkgdir}"/usr/share/${pkgbase}/
-
-  install -m755 pysmb.py \
-    "${pkgdir}"/usr/share/${pkgbase}/
-
-  install -d "${pkgdir}"/etc/dbus-1/system.d/
-  install -m644 dbus/com.redhat.NewPrinterNotification.conf \
-    dbus/com.redhat.PrinterDriversInstaller.conf \
-    "${pkgdir}"/etc/dbus-1/system.d/
-  install -d "${pkgdir}"/etc/cupshelpers/
-  install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
-
-  install -d "${pkgdir}"/usr/lib/udev/rules.d
-  install -m755 udev/{udev-add-printer,udev-configure-printer} \
-    "${pkgdir}"/usr/lib/udev/
-  install -m644 udev/70-printers.rules \
-    "${pkgdir}"/usr/lib/udev/rules.d
-
-  for file in build/lib/cupshelpers/*.py; do
-    install -Dm644 $file \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
-  done
-}
-
-package_system-config-printer-gnome() {
-  pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend'
-  depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify')
-  optdependence=('gnome-keyring: password management')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # files provided by system-config-printer-common
-  cd "${pkgdir}"/usr/share/${pkgbase}
-  rm config.py \
-    debug.py \
-    installpackage.py \
-    monitor.py \
-    PhysicalDevice.py \
-    ppdippstr.py \
-    probe_printer.py \
-    SearchCriterion.py \
-    smburi.py \
-    statereason.py \
-    pysmb.py
-  rm -r "${pkgdir}"/etc/dbus-1/
-  rm -r "${pkgdir}"/etc/cupshelpers/
-  rm -r "${pkgdir}"/etc/udev/
-  rm -r "${pkgdir}"/usr/lib/
-}
diff --git a/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch b/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 766dcb87f..000000000
--- a/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 25 May 2012 19:43:24 -0400
-Subject: [PATCH] Reinstate TIMEOUT= handling
-
-This is mostly to deal with ipw2?00 drivers which have yet to be fixed
-in the kernel.
----
- src/libudev/libudev-device.c  |   19 +++++++++++++++++++
- src/libudev/libudev-private.h |    1 +
- src/udev/udevd.c              |   13 ++++++++++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a8277d1..5966189 100644
---- a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
-         struct udev_list tags_list;
-         unsigned long long int seqnum;
-         unsigned long long int usec_initialized;
-+        int timeout;
-         int devlink_priority;
-         int refcount;
-         dev_t devnum;
-@@ -89,6 +90,21 @@ struct udev_device {
-         bool db_persist;
- };
- 
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+        return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+        char num[32];
-+
-+        udev_device->timeout = timeout;
-+        snprintf(num, sizeof(num), "%u", timeout);
-+        udev_device_add_property(udev_device, "TIMEOUT", num);
-+        return 0;
-+}
-+
- /**
-  * udev_device_get_seqnum:
-  * @udev_device: udev device
-@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
- 
-                 util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
-                 udev_device_set_syspath(udev_device, path);
-+        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (startswith(property, "SUBSYSTEM=")) {
-                 udev_device_set_subsystem(udev_device, &property[10]);
-         } else if (startswith(property, "DEVTYPE=")) {
-@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
-         udev_list_init(udev, &udev_device->sysattr_value_list, true);
-         udev_list_init(udev, &udev_device->sysattr_list, false);
-         udev_list_init(udev, &udev_device->tags_list, true);
-+        udev_device->timeout = -1;
-         udev_device->watch_handle = -1;
-         /* copy global properties */
-         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
-index 4eb4a59..99aefeb 100644
---- a/src/libudev/libudev-private.h
-+++ b/src/libudev/libudev-private.h
-@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
-         }
- }
- 
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
-         struct udev_list_node *loop;
- 
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
-                 return;
-         }
- 
--        if (children >= children_max) {
-+        if (!force && children >= children_max) {
-                 if (children_max > 1)
-                         log_debug("maximum number (%i) of children reached\n", children);
-                 return;
-@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
- 
-         event->state = EVENT_QUEUED;
-         udev_list_node_append(&event->node, &event_list);
-+
-+        /* run all events with a timeout set immediately */
-+        if (udev_device_get_timeout(dev) > 0) {
-+                event_run(event, true);
-+                return 0;
-+        }
-+
-         return 0;
- }
- 
-@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
-                 if (is_devpath_busy(event))
-                         continue;
- 
--                event_run(event);
-+                event_run(event, false);
-         }
- }
- 
--- 
-1.7.10.2
-
diff --git a/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch b/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch
deleted file mode 100644
index c92cf5d11..000000000
--- a/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sat, 22 Sep 2012 00:16:13 +0200
-Subject: [PATCH] journal: bring mmap cache prototype in sync
-
----
- src/journal/mmap-cache.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
-index de34634..0c42fb8 100644
---- a/src/journal/mmap-cache.h
-+++ b/src/journal/mmap-cache.h
-@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
- MMapCache* mmap_cache_ref(MMapCache *m);
- MMapCache* mmap_cache_unref(MMapCache *m);
- 
--int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
-+int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
- void mmap_cache_close_fd(MMapCache *m, int fd);
- void mmap_cache_close_context(MMapCache *m, unsigned context);
--- 
-1.7.12.1
-
diff --git a/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch b/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
deleted file mode 100644
index 5c6085c95..000000000
--- a/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 10 Aug 2012 11:02:03 -0400
-Subject: [PATCH] shutdown: recursively mark root as private before pivot
-
-Because root is now recursively marked as shared on bootup, we need to
-recursively mark root as private. This prevents a pivot_root failure on
-shutdown:
-
-  Cannot finalize remaining file systems and devices, giving up.
-  pivot failed: Invalid argument
----
- src/core/shutdown.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index 105a604..0b7cbd8 100644
---- a/src/core/shutdown.c
-+++ b/src/core/shutdown.c
-@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) {
-           It works for pivot_root, but the ref count for the root device
-           is not decreasing :-/
-         */
--        if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) {
-+        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) {
-                 log_error("Failed to make \"/\" private mount %m");
-                 return -errno;
-         }
--- 
-1.7.11.4
-
diff --git a/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch b/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
deleted file mode 100644
index 3aec94edc..000000000
--- a/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c516c8d17f77a1c761447f4c40c8dfffeda2e06d Mon Sep 17 00:00:00 2001
-From: Simon Peeters <peeters.simon@gmail.com>
-Date: Fri, 10 Aug 2012 17:32:19 +0200
-Subject: [PATCH] systemctl: fix issue with systemctl daemon-reexec
-
----
- src/shared/dbus-common.c  |  3 ++-
- src/systemctl/systemctl.c | 11 ++++++++---
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
-index 7f0dce5..da2dc2e 100644
---- a/src/shared/dbus-common.c
-+++ b/src/shared/dbus-common.c
-@@ -1287,7 +1287,8 @@ int bus_method_call_with_reply(DBusConnection *bus,
-         reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
-         dbus_message_unref(m);
-         if (!reply) {
--                log_error("Failed to issue method call: %s", bus_error_message(&error));
-+                if (!return_error)
-+                        log_error("Failed to issue method call: %s", bus_error_message(&error));
-                 if (bus_error_is_no_service(&error))
-                         r = -ENOENT;
-                 else if (dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED))
-diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 2e0aaaa..13e0f91 100644
---- a/src/systemctl/systemctl.c
-+++ b/src/systemctl/systemctl.c
-@@ -1537,11 +1537,12 @@ static int start_unit_one(
-                         DBUS_TYPE_INVALID);
-         free(n);
-         if (r) {
--                if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) {
-+                if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL )
-                         /* There's always a fallback possible for
-                          * legacy actions. */
-                         r = -EADDRNOTAVAIL;
--                }
-+                else
-+                        log_error("Failed to issue method call: %s", bus_error_message(error));
-                 goto finish;
-         }
- 
-@@ -3143,6 +3144,7 @@ finish:
- static int daemon_reload(DBusConnection *bus, char **args) {
-         int r;
-         const char *method;
-+        DBusError error;
- 
-         if (arg_action == ACTION_RELOAD)
-                 method = "Reload";
-@@ -3171,7 +3173,7 @@ static int daemon_reload(DBusConnection *bus, char **args) {
-                         "org.freedesktop.systemd1.Manager",
-                         method,
-                         NULL,
--                        NULL,
-+                        &error,
-                         DBUS_TYPE_INVALID);
- 
-         if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL)
-@@ -3182,6 +3184,9 @@ static int daemon_reload(DBusConnection *bus, char **args) {
-                 /* On reexecution, we expect a disconnect, not
-                  * a reply */
-                 r = 0;
-+        else if (r)
-+                log_error("Failed to issue method call: %s", bus_error_message(&error));
-+        dbus_error_free(&error);
- 
-         return r;
- }
--- 
-1.7.11.4
-
diff --git a/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
deleted file mode 100644
index 9be6ef28f..000000000
--- a/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Thu, 27 Sep 2012 20:48:13 -0400
-Subject: [PATCH] tmpfiles: restore previous behavior for F/f
-
-d4e9eb91ea changed the behavior for the F and f actions, wrongly sending
-them to glob_item(). Restore the old behavior and shortcut straight to
-write_one_file().
----
- src/tmpfiles/tmpfiles.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index f10f908..bf900fa 100644
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -673,6 +673,10 @@ static int create_item(Item *i) {
- 
-         case CREATE_FILE:
-         case TRUNCATE_FILE:
-+                r = write_one_file(i, i->path);
-+                if (r < 0)
-+                        return r;
-+                break;
-         case WRITE_FILE:
-                 r = glob_item(i, write_one_file);
-                 if (r < 0)
--- 
-1.7.12.1
-
diff --git a/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch b/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch
deleted file mode 100644
index 117b0df57..000000000
--- a/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Wed, 6 Jun 2012 14:30:16 +0200
-Subject: [PATCH] udev: systemd-udev-settle.service fix After=
-
-https://bugs.freedesktop.org/show_bug.cgi?id=50779
----
- units/systemd-udev-settle.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
-index d637700..2c4c129 100644
---- a/units/systemd-udev-settle.service.in
-+++ b/units/systemd-udev-settle.service.in
-@@ -21,7 +21,7 @@ Documentation=man:udev(7)
- Documentation=man:systemd-udevd(8)
- DefaultDependencies=no
- Wants=systemd-udev.service
--After=udev-trigger.service
-+After=systemd-udev-trigger.service
- Before=basic.target
- ConditionCapability=CAP_MKNOD
- 
--- 
-1.7.11
-
diff --git a/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch b/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
deleted file mode 100644
index a2cdf64a7..000000000
--- a/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From d305a67b46644d6360ef557109384c831ee8e018 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sun, 10 Jun 2012 20:37:14 +0200
-Subject: [PATCH] vconsole-setup: enable utf-8 mode explicitly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Rather than assuming the console is in utf-8 mode if nothing else is
-specified, be a bit more robust and enable it explicitly.
-
-This fixes a regression compared with Arch's initscripts when not
-using a framebuffer as the old VGA console would not be in utf-8
-mode by default.
-
-Furthermore, this would allow vconsole-setup to be used after boot
-to change the vconsole into utf-8 mode in case it has been set to
-non-utf-8 mode for whatever reason. I.e, the following would leave
-the console in utf-8 mode as expected:
-
- # export LANG=en_US.ISO-8859-1
- # /usr/lib/systemd/systemd-vconsole-setup
- # export LANG=en_US.UTF-8
- # /usr/lib/systemd/systemd-vconsole-setup
-
-Reported-by: Xyne <xyne@archlinx.ca>
-Reported-by: Thomas Bächler <thomas@archlinux.org>
-Cc: Dave Reisner <dreisner@archlinux.org>
----
- src/vconsole/vconsole-setup.c | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index d04fab4..aa5fa18 100644
---- a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
-@@ -80,6 +80,25 @@ static int disable_utf8(int fd) {
-         return r;
- }
- 
-+static int enable_utf8(int fd) {
-+        int r = 0, k;
-+
-+        if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0)
-+                r = -errno;
-+
-+        if (loop_write(fd, "\033%G", 3, false) < 0)
-+                r = -errno;
-+
-+        k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1");
-+        if (k < 0)
-+                r = k;
-+
-+        if (r < 0)
-+                log_warning("Failed to enable UTF-8: %s", strerror(-r));
-+
-+        return r;
-+}
-+
- static int load_keymap(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) {
-         const char *args[8];
-         int i = 0;
-@@ -418,9 +437,12 @@ int main(int argc, char **argv) {
- 
-         r = EXIT_FAILURE;
- 
--        if (!utf8)
-+        if (utf8)
-+                enable_utf8(fd);
-+        else
-                 disable_utf8(fd);
- 
-+
-         if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
-             load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
-                 r = EXIT_SUCCESS;
--- 
-1.7.11
-
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
deleted file mode 100644
index cce4b8e44..000000000
--- a/testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=195
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
-             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
-             'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        'initcpio-hook-udev'
-        'initcpio-install-udev'
-        'initcpio-install-timestamp'
-        '0001-Reinstate-TIMEOUT-handling.patch'
-        'use-split-usr-path.patch')
-md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         'fb37e34ea006c79be1c54cbb0f803414'
-         'df69615503ad293c9ddf9d8b7755282d'
-         '5543be25f205f853a21fa5ee68e03f0d'
-         'fd5b5f04ab0a847373d357555129d4c0')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # still waiting on ipw2x00, et al to get fixed...
-  patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
-  # hang onto this until we do the /{,s}bin merge
-  patch -Np1 <"$srcdir/use-split-usr-path.patch"
-
-  ./configure \
-      --libexecdir=/usr/lib \
-      --localstatedir=/var \
-      --sysconfdir=/etc \
-      --enable-introspection \
-      --enable-gtk-doc \
-      --disable-audit \
-      --disable-ima \
-      --with-distro=arch \
-      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-      --with-pci-ids-path=/usr/share/hwdata/pci.ids
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
-           'pam' 'util-linux' 'xz')
-  provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('libsystemd' 'systemd-tools' 'udev')
-  conflicts=('libsystemd' 'systemd-tools' 'udev')
-  optdepends=('initscripts: legacy support for /etc/rc.conf'
-              'python: systemd library bindings'
-              'python2-cairo: systemd-analyze'
-              'python2-dbus: systemd-analyze'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries'
-              'cryptsetup: required for encrypted block devices'
-              'quota-tools: kernel-level quota management')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/systemd/system.conf
-          etc/systemd/user.conf
-          etc/systemd/logind.conf
-          etc/systemd/journald.conf
-          etc/udev/udev.conf)
-  install="systemd.install"
-
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # move bash-completion and symlink for *ctl's
-  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
-    "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  for ctl in {login,journal,timedate,locale,hostname}ctl; do
-    ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl"
-  done
-  rm -rf "$pkgdir/etc/bash_completion.d"
-
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
-
-  # get rid of RPM macros
-  rm -r "$pkgdir/etc/rpm"
-
-  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
-  # https://pokersource.info/show_bug.cgi?id=50989
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # the path to udevadm is hardcoded in some places
-  install -d "$pkgdir/sbin"
-  ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
-
-  # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
-  ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
-
-  # add back tmpfiles.d/legacy.conf
-  install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
-          s#GROUP="tape"#GROUP="storage"#g;
-          s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-
-  # add mkinitcpio hooks
-  install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
-  install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
-  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-
-  # XXX: kill off coredump rule until the journal can recover coredumps
-  rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
-
-  ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
-
-  # create /var/log/journal. users can control the actual log destination via journald.conf
-  install -dm755 "$pkgdir/var/log/journal"
-}
-
-package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
-  groups=('base')
-  conflicts=('sysvinit')
-  depends=('sysvinit-tools' 'systemd')
-
-  mv "$srcdir/_sysvcompat"/* "$pkgdir"
-
-  install -dm755 "$pkgdir/sbin"
-  for tool in runlevel reboot shutdown poweroff halt telinit; do
-    ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
-  done
-
-  ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/systemd/initcpio-hook-udev b/testing/systemd/initcpio-hook-udev
deleted file mode 100644
index 75da7e4a8..000000000
--- a/testing/systemd/initcpio-hook-udev
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    udevd --daemon --resolve-names=never
-    udevd_running=1
-}
-
-run_hook() {
-    msg ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-}
-
-run_cleanuphook() {
-    udevadm control --exit
-    udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/systemd/initcpio-install-timestamp b/testing/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/testing/systemd/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
-    cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/systemd/initcpio-install-udev b/testing/systemd/initcpio-install-udev
deleted file mode 100644
index 15124b8f7..000000000
--- a/testing/systemd/initcpio-install-udev
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    add_file "/etc/udev/udev.conf"
-    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
-    add_binary /usr/bin/udevadm
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
-    done
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/systemd/locale.sh b/testing/systemd/locale.sh
deleted file mode 100644
index a4c413eed..000000000
--- a/testing/systemd/locale.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-if [ ! -r /etc/locale.conf ]; then
-  return
-fi
-
-. /etc/locale.conf
-
-if [ "${LANG+x}" = 'x' ]; then
-  export LANG
-fi
-
-if [ "${LC_CTYPE+x}" = 'x' ]; then
-  export LC_CTYPE
-fi
-
-if [ "${LC_NUMERIC+x}" = 'x' ]; then
-  export LC_NUMERIC
-fi
-
-if [ "${LC_TIME+x}" = 'x' ]; then
-  export LC_TIME
-fi
-
-if [ "${LC_COLLATE+x}" = 'x' ]; then
-  export LC_COLLATE
-fi
-
-if [ "${LC_MONETARY+x}" = 'x' ]; then
-  export LC_MONETARY
-fi
-
-if [ "${LC_MESSAGES+x}" = 'x' ]; then
-  export LC_MESSAGES
-fi
-
-if [ "${LC_PAPER+x}" = 'x' ]; then
-  export LC_PAPER
-fi
-
-if [ "${LC_NAME+x}" = 'x' ]; then
-  export LC_NAME
-fi
-
-if [ "${LC_ADDRESS+x}" = 'x' ]; then
-  export LC_ADDRESS
-fi
-
-if [ "${LC_TELEPHONE+x}" = 'x' ]; then
-  export LC_TELEPHONE
-fi
-
-if [ "${LC_MEASUREMENT+x}" = 'x' ]; then
-  export LC_MEASUREMENT
-fi
-
-if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then
-  export LC_IDENTIFICATION
-fi
-
diff --git a/testing/systemd/systemd-tools.install b/testing/systemd/systemd-tools.install
deleted file mode 100644
index 7d0bd8790..000000000
--- a/testing/systemd/systemd-tools.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_install() {
-  systemd-machine-id-setup
-}
-
-post_upgrade() {
-  systemd-machine-id-setup
-
-  if [ "$(vercmp $2 174)" -lt 0 ]; then
-    echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
-    echo "   'scanner' and 'video' groups. Beware of any changes."
-    echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-    echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
-    echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-    echo "   this functionality back."
-    echo " * We no longer create the static nodes on install needed for an initrd-less"
-    echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
-    echo "   installs."
-  fi
-  if [ "$(vercmp $2 175)" -lt 0 ]; then
-    echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
-    echo "   kernels have this enabled."
-  fi
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo " * udev-compat has been removed, and should be uninstalled."
-    echo " * Framebuffers are no longer blacklisted by default."
-    echo " * binaries moved from /sbin to /usr/bin"
-  fi
-  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
-    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
-    echo "   load the 'loop' module before using losetup"
-  fi
-}
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
deleted file mode 100644
index aad9691b0..000000000
--- a/testing/systemd/systemd.install
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
-}
-
-post_common() {
-  systemd-machine-id-setup
-
-  setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt
-
-  if sd_booted; then
-    systemctl --system daemon-reexec
-  fi
-}
-
-post_install() {
-  post_common
-
-  # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@.service
-
-  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
-  echo "   bootloader to replace sysvinit with systemd"
-}
-
-post_upgrade() {
-  post_common
-
-  # getty@tty1.service is no longer enabled by default, but we don't want to break
-  # existing setups.
-  if [ "$(vercmp 183 "$2")" -eq 1 ]; then
-    # systemctl seems to be whiny on sysvinit. this will succeed unless something
-    # horrific happens, so just mask the error.
-    systemctl -q enable getty@.service || true
-  fi
-
-  if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then
-    printf '==> journald now writes to /var/log/journal by default. This can be\n'
-    printf '    controlled with the Storage setting in /etc/systemd/journald.conf\n'
-  fi
-
-  # logind's protocol changed. kindly restart the daemon to avoid locking
-  # out further logins.
-  if [ "$(vercmp 195 "$2")" -eq 1 ]; then
-    if sd_booted; then
-      systemctl restart systemd-logind.service
-    fi
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/systemd/use-split-usr-path.patch b/testing/systemd/use-split-usr-path.patch
deleted file mode 100644
index 2fd32998d..000000000
--- a/testing/systemd/use-split-usr-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/core/main.c	2012-09-20 23:02:54.000000000 -0400
-+++ b/src/core/main.c	2012-09-20 23:03:13.000000000 -0400
-@@ -1455,11 +1455,7 @@
- 
-         /* Set up PATH unless it is already set */
-         setenv("PATH",
--#ifdef HAVE_SPLIT_USR
-                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
--#else
--               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
--#endif
-                arg_running_as == SYSTEMD_SYSTEM);
- 
-         if (arg_running_as == SYSTEMD_SYSTEM) {
diff --git a/testing/sysvinit/0001-simplify-writelog.patch b/testing/sysvinit/0001-simplify-writelog.patch
deleted file mode 100644
index cc28f14bc..000000000
--- a/testing/sysvinit/0001-simplify-writelog.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Fri, 15 Jun 2012 16:41:52 +0200
-Subject: [PATCH 1/2] simplify writelog()
-
-All we do is prepend the date and remove \r. We don't handle color
-codes, but the user can just cat the log file in a terminal and it will
-interpret the codes correctly.
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c |   76 +++++++++++++++++-------------------------------------------
- 1 file changed, 21 insertions(+), 55 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index 570d382..e36e261 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -68,11 +68,6 @@ int didnl = 1;
- int createlogfile = 0;
- int syncalot = 0;
- 
--struct line {
--	char buf[256];
--	int pos;
--} line;
--
- /*
-  *	Console devices as listed on the kernel command line and
-  *	the mapping to actual devices in /dev
-@@ -351,63 +346,34 @@ int consolename(char *res, int rlen)
-  */
- void writelog(FILE *fp, unsigned char *ptr, int len)
- {
--	time_t		t;
--	char		*s;
--	char		tmp[8];
--	int		olen = len;
--	int		dosync = 0;
--	int		tlen;
--
--	while (len > 0) {
--		tmp[0] = 0;
--		if (didnl) {
-+	int dosync = 0;
-+	int i;
-+	static int first_run = 1;
-+
-+	for (i = 0; i < len; i++) {
-+		int ignore = 0;
-+
-+		/* prepend date to every line */
-+		if (*(ptr-1) == '\n' || first_run) {
-+			time_t t;
-+			char *s;
- 			time(&t);
- 			s = ctime(&t);
- 			fprintf(fp, "%.24s: ", s);
--			didnl = 0;
-+			dosync = 1;
-+			first_run = 0;
- 		}
--		switch (*ptr) {
--			case 27: /* ESC */
--				strcpy(tmp, "^[");
--				break;
--			case '\r':
--				line.pos = 0;
--				break;
--			case 8: /* ^H */
--				if (line.pos > 0) line.pos--;
--				break;
--			case '\n':
--				didnl = 1;
--				dosync = 1;
--				break;
--			case '\t':
--				line.pos += (line.pos / 8 + 1) * 8;
--				if (line.pos >= (int)sizeof(line.buf))
--					line.pos = sizeof(line.buf) - 1;
--				break;
--			case  32 ... 127:
--			case 161 ... 255:
--				tmp[0] = *ptr;
--				tmp[1] = 0;
--				break;
--			default:
--				sprintf(tmp, "\\%03o", *ptr);
--				break;
--		}
--		ptr++;
--		len--;
- 
--		tlen = strlen(tmp);
--		if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
--			memcpy(line.buf + line.pos, tmp, tlen);
--			line.pos += tlen;
-+		if (*ptr == '\r') {
-+			ignore = 1;
- 		}
--		if (didnl) {
--			fprintf(fp, "%s\n", line.buf);
--			memset(&line, 0, sizeof(line));
-+
-+		if (!ignore) {
-+			fwrite(ptr, sizeof(char), 1, fp);
- 		}
--	}
- 
-+		ptr++;
-+	}
- 	if (dosync) {
- 		fflush(fp);
- 		if (syncalot) {
-@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- 		}
- 	}
- 
--	outptr += olen;
-+	outptr += len;
- 	if (outptr >= endptr)
- 		outptr = ringbuf;
- 
--- 
-1.7.10.4
-
diff --git a/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch b/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch
deleted file mode 100644
index 89b3280df..000000000
--- a/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 8d0022d9540112a92ce8d88c91c4ac10bad8c9ef Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Sun, 24 Jun 2012 15:49:51 +0200
-Subject: [PATCH 2/2] remove ansi escape codes from log file
-
-References: https://en.wikipedia.org/wiki/ANSI_escape_code
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 43 insertions(+), 2 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index e36e261..88e610d 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -349,6 +349,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- 	int dosync = 0;
- 	int i;
- 	static int first_run = 1;
-+	static int inside_esc = 0;
- 
- 	for (i = 0; i < len; i++) {
- 		int ignore = 0;
-@@ -364,10 +365,50 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- 			first_run = 0;
- 		}
- 
--		if (*ptr == '\r') {
--			ignore = 1;
-+		/* remove escape sequences, but do it in a way that allows us to stop
-+		 * in the middle in case the string was cut off */
-+		if (inside_esc == 1) {
-+			/* first '[' is special because if we encounter it again, it should be considered the final byte */
-+			if (*ptr == '[') {
-+				/* multi char sequence */
-+				ignore = 1;
-+				inside_esc = 2;
-+			} else {
-+				/* single char sequence */
-+				if (*ptr >= 64 && *ptr <= 95) {
-+					ignore = 1;
-+				}
-+				inside_esc = 0;
-+			}
-+		} else if (inside_esc == 2) {
-+			switch (*ptr) {
-+				case '0' ... '9': /* intermediate chars of escape sequence */
-+				case ';':
-+				case 32 ... 47:
-+					if (inside_esc) {
-+						ignore = 1;
-+					}
-+					break;
-+				case 64 ... 126: /* final char of escape sequence */
-+					if (inside_esc) {
-+						ignore = 1;
-+						inside_esc = 0;
-+					}
-+					break;
-+			}
-+		} else {
-+			switch (*ptr) {
-+				case '\r':
-+					ignore = 1;
-+					break;
-+				case 27: /* ESC */
-+					ignore = 1;
-+					inside_esc = 1;
-+					break;
-+			}
- 		}
- 
-+
- 		if (!ignore) {
- 			fwrite(ptr, sizeof(char), 1, fp);
- 		}
--- 
-1.7.10.4
-
diff --git a/testing/sysvinit/PKGBUILD b/testing/sysvinit/PKGBUILD
deleted file mode 100644
index 9772bf6a5..000000000
--- a/testing/sysvinit/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 168493 2012-10-12 19:09:19Z thomas $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgbase=sysvinit
-pkgname=('sysvinit-tools' 'sysvinit')
-pkgver=2.88
-pkgrel=9
-arch=('i686' 'x86_64')
-url="http://savannah.nongnu.org/projects/sysvinit"
-license=('GPL')
-depends=('util-linux' 'coreutils' 'glibc' 'awk')
-source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgbase}-${pkgver}dsf.tar.bz2
-        "0001-simplify-writelog.patch"
-        "0002-remove-ansi-escape-codes-from-log-file.patch")
-sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
-          '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d'
-          'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}dsf"
-
-  # FS#30005
-  patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
-  patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch"
-
-  make 
-}
-
-package_sysvinit-tools() {
-  pkgdesc="Linux System V Init Tools"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}dsf"
-  make ROOT="${pkgdir}" install
-
-  # provided by util-linux
-  cd "${pkgdir}"
-  rm bin/mountpoint
-  rm usr/share/man/man1/mountpoint.1
-  rm usr/bin/{mesg,utmpdump,wall}
-  rm usr/share/man/man1/{mesg,utmpdump,wall}.1
-  rm sbin/sulogin
-  rm usr/share/man/man8/sulogin.8
-
-  ### split out sysvinit
-  rm -rf ${srcdir}/_sysvinit
-  install -dm755 \
-        ${srcdir}/_sysvinit/sbin \
-        ${srcdir}/_sysvinit/usr/share/man/man8
-  cd ${srcdir}/_sysvinit
-  mv ${pkgdir}/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} sbin/
-  mv ${pkgdir}/usr/share/man/man5 usr/share/man/
-  mv ${pkgdir}/usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}.8 usr/share/man/man8/
-}
-
-package_sysvinit() {
-  pkgdesc="Linux System V Init"
-  depends=('sysvinit-tools')
-  install=sysvinit.install
-
-  mv "${srcdir}"/_sysvinit/* $pkgdir
-}
diff --git a/testing/sysvinit/Remove-handling-of-special-chars-fix-per-line-buffer.patch b/testing/sysvinit/Remove-handling-of-special-chars-fix-per-line-buffer.patch
deleted file mode 100644
index b573b9a6d..000000000
--- a/testing/sysvinit/Remove-handling-of-special-chars-fix-per-line-buffer.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 4d2b17f47073e0491f9dfa62797cc727d4530f22 Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Tue, 22 May 2012 22:14:52 +0200
-Subject: [PATCH] Remove handling of special chars; fix per line buffer
- problem
-
-The linebuffer was only 256 chars so longer lines were truncated.
-
-By removing the handling of special chars (for example: /n/r/t) and
-simply writing everything we read as is to the logfile we fix this bug,
-make the code much smaller and allow users to write userspace tools that
-correctly handle rendering.
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c |  139 +++++++++---------------------------------------------------
- 1 file changed, 19 insertions(+), 120 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index 570d382..5df8fb9 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -58,21 +58,10 @@ char *Version = "@(#) bootlogd 2.86 03-Jun-2004 miquels@cistron.nl";
- 
- #define LOGFILE	"/var/log/boot"
- 
--char ringbuf[32768];
--char *endptr = ringbuf + sizeof(ringbuf);
--char *inptr  = ringbuf;
--char *outptr = ringbuf;
--
- int got_signal = 0;
--int didnl = 1;
- int createlogfile = 0;
- int syncalot = 0;
- 
--struct line {
--	char buf[256];
--	int pos;
--} line;
--
- /*
-  *	Console devices as listed on the kernel command line and
-  *	the mapping to actual devices in /dev
-@@ -345,83 +334,6 @@ int consolename(char *res, int rlen)
- 	return -1;
- }
- 
--
--/*
-- *	Write data and make sure it's on disk.
-- */
--void writelog(FILE *fp, unsigned char *ptr, int len)
--{
--	time_t		t;
--	char		*s;
--	char		tmp[8];
--	int		olen = len;
--	int		dosync = 0;
--	int		tlen;
--
--	while (len > 0) {
--		tmp[0] = 0;
--		if (didnl) {
--			time(&t);
--			s = ctime(&t);
--			fprintf(fp, "%.24s: ", s);
--			didnl = 0;
--		}
--		switch (*ptr) {
--			case 27: /* ESC */
--				strcpy(tmp, "^[");
--				break;
--			case '\r':
--				line.pos = 0;
--				break;
--			case 8: /* ^H */
--				if (line.pos > 0) line.pos--;
--				break;
--			case '\n':
--				didnl = 1;
--				dosync = 1;
--				break;
--			case '\t':
--				line.pos += (line.pos / 8 + 1) * 8;
--				if (line.pos >= (int)sizeof(line.buf))
--					line.pos = sizeof(line.buf) - 1;
--				break;
--			case  32 ... 127:
--			case 161 ... 255:
--				tmp[0] = *ptr;
--				tmp[1] = 0;
--				break;
--			default:
--				sprintf(tmp, "\\%03o", *ptr);
--				break;
--		}
--		ptr++;
--		len--;
--
--		tlen = strlen(tmp);
--		if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
--			memcpy(line.buf + line.pos, tmp, tlen);
--			line.pos += tlen;
--		}
--		if (didnl) {
--			fprintf(fp, "%s\n", line.buf);
--			memset(&line, 0, sizeof(line));
--		}
--	}
--
--	if (dosync) {
--		fflush(fp);
--		if (syncalot) {
--			fdatasync(fileno(fp));
--		}
--	}
--
--	outptr += olen;
--	if (outptr >= endptr)
--		outptr = ringbuf;
--
--}
--
--
- /*
-  *	Print usage message and exit.
-  */
-@@ -481,7 +393,6 @@ int main(int argc, char **argv)
- 	int		ptm, pts;
- 	int		realfd;
- 	int		n, m, i;
--	int		todo;
- 
- 	fp = NULL;
- 	logfile = LOGFILE;
-@@ -615,13 +526,13 @@ int main(int argc, char **argv)
- 			/*
- 			 *	See how much space there is left, read.
- 			 */
--			if ((n = read(ptm, inptr, endptr - inptr)) >= 0) {
-+			if ((n = read(ptm, buf, sizeof(buf))) >= 0) {
- 				/*
- 				 *	Write data (in chunks if needed)
- 				 *	to the real output device.
- 				 */
- 				m = n;
--				p = inptr;
-+				p = buf;
- 				while (m > 0) {
- 					i = write(realfd, p, m);
- 					if (i >= 0) {
-@@ -641,43 +552,31 @@ int main(int argc, char **argv)
- 				}
- 
- 				/*
--				 *	Increment buffer position. Handle
--				 *	wraps, and also drag output pointer
--				 *	along if we cross it.
-+				 *	Perhaps we need to open the logfile.
- 				 */
--				inptr += n;
--				if (inptr - n < outptr && inptr > outptr)
--					outptr = inptr;
--				if (inptr >= endptr)
--					inptr = ringbuf;
--				if (outptr >= endptr)
--					outptr = ringbuf;
--			}
--		}
-+				if (fp == NULL && access(logfile, F_OK) == 0) {
-+					if (rotate) {
-+						snprintf(buf, sizeof(buf), "%s~", logfile);
-+						rename(logfile, buf);
-+					}
-+					fp = fopen(logfile, "a");
-+				}
-+				if (fp == NULL && createlogfile)
-+					fp = fopen(logfile, "a");
- 
--		/*
--		 *	Perhaps we need to open the logfile.
--		 */
--		if (fp == NULL && access(logfile, F_OK) == 0) {
--			if (rotate) {
--				snprintf(buf, sizeof(buf), "%s~", logfile);
--				rename(logfile, buf);
-+				if (fp) {
-+					write(fileno(fp), buf, n);
-+				}
-+
-+				if (syncalot) {
-+					fdatasync(fileno(fp));
-+				}
- 			}
--			fp = fopen(logfile, "a");
- 		}
--		if (fp == NULL && createlogfile)
--			fp = fopen(logfile, "a");
- 
--		if (inptr >= outptr)
--			todo = inptr - outptr;
--		else
--			todo = endptr - outptr;
--		if (fp && todo)
--			writelog(fp, (unsigned char *)outptr, todo);
- 	}
- 
- 	if (fp) {
--		if (!didnl) fputc('\n', fp);
- 		fclose(fp);
- 	}
- 
--- 
-1.7.10.2
-
diff --git a/testing/sysvinit/simplify-writelog.patch b/testing/sysvinit/simplify-writelog.patch
deleted file mode 100644
index 272a88980..000000000
--- a/testing/sysvinit/simplify-writelog.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Fri, 15 Jun 2012 16:41:52 +0200
-Subject: [PATCH] simplify writelog()
-
-All we do is prepend the date and remove \r. We don't handle color
-codes, but the user can just cat the log file in a terminal and it will
-interpret the codes correctly.
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c |   76 +++++++++++++++++-------------------------------------------
- 1 file changed, 21 insertions(+), 55 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index 570d382..e36e261 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -68,11 +68,6 @@ int didnl = 1;
- int createlogfile = 0;
- int syncalot = 0;
- 
--struct line {
--	char buf[256];
--	int pos;
--} line;
--
- /*
-  *	Console devices as listed on the kernel command line and
-  *	the mapping to actual devices in /dev
-@@ -351,63 +346,34 @@ int consolename(char *res, int rlen)
-  */
- void writelog(FILE *fp, unsigned char *ptr, int len)
- {
--	time_t		t;
--	char		*s;
--	char		tmp[8];
--	int		olen = len;
--	int		dosync = 0;
--	int		tlen;
--
--	while (len > 0) {
--		tmp[0] = 0;
--		if (didnl) {
-+	int dosync = 0;
-+	int i;
-+	static int first_run = 1;
-+
-+	for (i = 0; i < len; i++) {
-+		int ignore = 0;
-+
-+		/* prepend date to every line */
-+		if (*(ptr-1) == '\n' || first_run) {
-+			time_t t;
-+			char *s;
- 			time(&t);
- 			s = ctime(&t);
- 			fprintf(fp, "%.24s: ", s);
--			didnl = 0;
-+			dosync = 1;
-+			first_run = 0;
- 		}
--		switch (*ptr) {
--			case 27: /* ESC */
--				strcpy(tmp, "^[");
--				break;
--			case '\r':
--				line.pos = 0;
--				break;
--			case 8: /* ^H */
--				if (line.pos > 0) line.pos--;
--				break;
--			case '\n':
--				didnl = 1;
--				dosync = 1;
--				break;
--			case '\t':
--				line.pos += (line.pos / 8 + 1) * 8;
--				if (line.pos >= (int)sizeof(line.buf))
--					line.pos = sizeof(line.buf) - 1;
--				break;
--			case  32 ... 127:
--			case 161 ... 255:
--				tmp[0] = *ptr;
--				tmp[1] = 0;
--				break;
--			default:
--				sprintf(tmp, "\\%03o", *ptr);
--				break;
--		}
--		ptr++;
--		len--;
- 
--		tlen = strlen(tmp);
--		if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
--			memcpy(line.buf + line.pos, tmp, tlen);
--			line.pos += tlen;
-+		if (*ptr == '\r') {
-+			ignore = 1;
- 		}
--		if (didnl) {
--			fprintf(fp, "%s\n", line.buf);
--			memset(&line, 0, sizeof(line));
-+
-+		if (!ignore) {
-+			fwrite(ptr, sizeof(char), 1, fp);
- 		}
--	}
- 
-+		ptr++;
-+	}
- 	if (dosync) {
- 		fflush(fp);
- 		if (syncalot) {
-@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- 		}
- 	}
- 
--	outptr += olen;
-+	outptr += len;
- 	if (outptr >= endptr)
- 		outptr = ringbuf;
- 
--- 
-1.7.10.4
-
diff --git a/testing/sysvinit/sysvinit.install b/testing/sysvinit/sysvinit.install
deleted file mode 100644
index 2f0e62e74..000000000
--- a/testing/sysvinit/sysvinit.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_upgrade() {
-  [ -x sbin/init ] && sbin/init u
-}
diff --git a/testing/taglib/PKGBUILD b/testing/taglib/PKGBUILD
deleted file mode 100644
index 459bd1476..000000000
--- a/testing/taglib/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 166904 2012-09-21 14:17:12Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Ike Devolder <ike.devolder@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=taglib
-pkgver=1.8
-pkgrel=1
-pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
-arch=('i686' 'x86_64')
-url="http://developer.kde.org/~wheeler/taglib.html"
-license=('LGPL' 'MPL')
-depends=('sh' 'zlib' 'gcc-libs')
-makedepends=('cmake' 'pkg-config')
-options=('!libtool')
-source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_MP4=ON \
-    -DWITH_ASF=ON
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/tcl/PKGBUILD b/testing/tcl/PKGBUILD
deleted file mode 100644
index ee3bd172a..000000000
--- a/testing/tcl/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 164247 2012-07-28 09:51:11Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=tcl
-pkgver=8.5.12
-pkgrel=1
-pkgdesc="The Tcl scripting language"
-arch=('i686' 'x86_64')
-url="http://tcl.sourceforge.net/"
-license=('custom')
-source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('174b2b4c619ba8f96875d8a051917703')
-
-build() {
-  cd ${srcdir}/tcl${pkgver}/unix
-  
-  if [ "$CARCH" = "x86_64" ]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit
-  else
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit
-  fi
-  
-  make
-}
-
-check() {
-  cd ${srcdir}/tcl${pkgver}/unix
-  make test
-}
-
-package()
-{
-  cd ${srcdir}/tcl${pkgver}/unix
-  
-  make INSTALL_ROOT=${pkgdir} install install-private-headers
-  ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh
-  
-  # install license
-  install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # remove buildroot traces
-  sed -i \
-    -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
-    -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include'," \
-    -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-    -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \
-    -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \
-    -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \
-    -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \
-    ${pkgdir}/usr/lib/tclConfig.sh
-}
diff --git a/testing/telepathy-farstream/PKGBUILD b/testing/telepathy-farstream/PKGBUILD
deleted file mode 100644
index 9c0821374..000000000
--- a/testing/telepathy-farstream/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169154 2012-10-18 19:22:38Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=telepathy-farstream
-pkgver=0.6.0
-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' 'farstream')
-makedepends=('dbus-glib' 'gobject-introspection')
-conflicts=('telepathy-farsight')
-replaces=('telepathy-farsight')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d154350f9f1e3bdba87617c0668481a5')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/telepathy \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$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 2ae8c9650..000000000
--- a/testing/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169153 2012-10-18 19:22:37Z jgc $
-# 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.17.1
-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' 'sqlite')
-makedepends=('libxslt' 'python2')
-options=('!libtool' '!emptydirs')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-install=telepathy-gabble.install
-md5sums=('42e01fdc4117255080883495411e7318')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console"
-}
diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/testing/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD
deleted file mode 100644
index 29f21ee83..000000000
--- a/testing/telepathy-glib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169152 2012-10-18 19:22:35Z jgc $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-
-pkgname=telepathy-glib
-pkgver=0.20.0
-pkgrel=1
-pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('LGPL2.1')
-options=('!libtool' '!emptydirs')
-depends=('dbus-glib')
-makedepends=('libxslt' 'vala' 'gobject-introspection')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('9d7b2bcc2d9f8e0352c8789952717d83')
-
-build() {
-    cd $pkgname-$pkgver
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-        --libexecdir=/usr/lib/telepathy \
-        --enable-vala-bindings \
-        --enable-static=no
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD
deleted file mode 100644
index fd9c4ac92..000000000
--- a/testing/telepathy-mission-control/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169151 2012-10-18 19:22:33Z jgc $
-# 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.14.0
-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' 'dconf' 'upower' 'networkmanager')
-makedepends=('libxslt' 'python2')
-install=telepathy-mission-control.install
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('483fa8860891815a540ecf1bb9155122')
-
-build() {
-    cd "$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy \
-	--enable-gnome-keyring \
-        --disable-schemas-compile
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/telepathy-mission-control/telepathy-mission-control.install b/testing/telepathy-mission-control/telepathy-mission-control.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/testing/telepathy-mission-control/telepathy-mission-control.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/timidity++/PKGBUILD b/testing/timidity++/PKGBUILD
deleted file mode 100644
index cec8e8a35..000000000
--- a/testing/timidity++/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165420 2012-08-18 23:03:32Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=timidity++
-pkgver=2.14.0
-pkgrel=3
-pkgdesc="A MIDI to WAVE converter and player"
-arch=('i686' 'x86_64')
-url="http://timidity.sourceforge.net"
-license=('GPL')
-depends=('libao' 'libvorbis' 'jack' 'ncurses')
-makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw')
-optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \
-            'xaw3d: for using the Xaw interface')
-backup=('etc/timidity++/timidity.cfg')
-source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \
-        timidity.cfg timidity++.sh timidity.service)
-sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
-          '660b3afbb720d26e8f008034cee66dd8da082d6e'
-          '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
-          'f0351b9eb8928d3d82c380107654a7dbe7cd2d54')
-
-build() {
-  cd "${srcdir}/TiMidity++-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \
-    --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \
-    --enable-audio=alsa,oss,ao,vorbis,flac,jack \
-    --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk
-  make
-}
-
-package() {
-  cd "${srcdir}/TiMidity++-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
-  install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++"
-  install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service"
-}
diff --git a/testing/timidity++/timidity++.sh b/testing/timidity++/timidity++.sh
deleted file mode 100644
index 3fa13cea9..000000000
--- a/testing/timidity++/timidity++.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/timidity`
-case "$1" in
-   start)
-     stat_busy "Starting Timidity++ ALSA Daemon"
-     [ -z "$PID" ] && /usr/bin/timidity -iAD > /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       echo $PID > /var/run/timidity.pid
-       add_daemon timidity++
-       stat_done
-     fi
-     ;;
-   stop)
-     stat_busy "Stopping Timidity++ ALSA Daemon"
-     [ ! -z "$PID" ]  && kill $PID &> /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm /var/run/timidity.pid
-       rm_daemon timidity++
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 1
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/timidity++/timidity.cfg b/testing/timidity++/timidity.cfg
deleted file mode 100644
index 59bbfa935..000000000
--- a/testing/timidity++/timidity.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-# details on this file and other examples see here:
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/
-#----------------------------------------------------------------
-# SoundFont extension configuration
-#
-# soundfont <filename> [order={0|1}] [remove]
-#    <filename> is the path of SoundFont file.
-#    order: 0(preload) or 1(load after GUS).
-#    remove: disable specified soundfont.
-#
-# font exclude <tonebank> [<preset> [<keynote>]]
-# font order {0|1} <tonebank> [<preset> [<keynote>]]
-#    <tonebank>: 0-127
-#
-# font exclude 128 [<drumset> [<key>]]
-# font order {0|1} 128 [<drumset> [<key>]]
-#----------------------------------------------------------------
-
-# change the next line to point to a soundfont you have
-# soundfonts can be found e.g. here: http://www.hammersound.net/
-# soundfont /usr/share/soundfonts/DX7Piano.SF2
-
-# you can do manipulations of the soundfont you load like this:
-# e.g. removing drumset 99
-# font exclude 128 99
-
-# load drum samples after GUS patches
-# font order 1 128
diff --git a/testing/timidity++/timidity.service b/testing/timidity++/timidity.service
deleted file mode 100644
index 4d6ceea6a..000000000
--- a/testing/timidity++/timidity.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=TiMidity++ Daemon
-After=sound.target
-
-[Service]
-ExecStart=/usr/bin/timidity -iA
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/tinycdb/PKGBUILD b/testing/tinycdb/PKGBUILD
deleted file mode 100644
index 69c665528..000000000
--- a/testing/tinycdb/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 163100 2012-07-07 03:15:00Z bisson $
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=tinycdb
-pkgver=0.78
-pkgrel=1
-pkgdesc='Very fast and simple package for creating and reading constant data bases'
-url='http://www.corpit.ru/mjt/tinycdb.html'
-license=('custom')
-arch=('i686' 'x86_64')
-source=("http://www.corpit.ru/mjt/tinycdb/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('ade42ee1e7c56f66a63cb933206c089b9983adba')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed -e 's/all: static/all: shared/' -e '/libcdb.a/d' -i Makefile
-	make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" prefix=/usr mandir=/usr/share/man \
-		INSTALLPROG=cdb-shared install-{all,sharedlib}
-	install -Dm644 debian/copyright "${pkgdir}"/usr/share/licenses/tinycdb/copyright
-}
diff --git a/testing/tk/PKGBUILD b/testing/tk/PKGBUILD
deleted file mode 100644
index cc57372c8..000000000
--- a/testing/tk/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 164249 2012-07-28 09:52:37Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=tk
-pkgver=8.5.12
-pkgrel=1
-pkgdesc="A windowing toolkit for use with tcl"
-arch=('i686' 'x86_64')
-url="http://tcl.sourceforge.net/"
-license=('custom')
-depends=("tcl=${pkgver}" 'libxss' 'libxft')
-source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('a01640176845c1f654a412cfc9bab13b')
-
-build() {
-  cd ${srcdir}/tk${pkgver}/unix
-
-  if [ "$CARCH" = "x86_64" ]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit
-  else
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit
-  fi
-  
-  make
-}
-
-#check() {
-#  cd ${srcdir}/tk${pkgver}/unix
-#  make test
-#}
-
-package() {
-  cd ${srcdir}/tk${pkgver}/unix
-
-  make INSTALL_ROOT=${pkgdir} install install-private-headers
-  ln -sf wish8.5 ${pkgdir}/usr/bin/wish
-  
-  # install private headers (FS#14388)
-  cd ${srcdir}/tk${pkgver}
-  for dir in compat generic generic/ttk unix; do
-    install -dm755 ${pkgdir}/usr/include/tk-private/$dir
-    install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h
-  done
-
-  # install license
-  install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # remove buildroot traces
-  sed -i \
-    -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \
-    -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \
-    -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-    -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \
-    ${pkgdir}/usr/lib/tkConfig.sh
-}
diff --git a/testing/totem-plparser/PKGBUILD b/testing/totem-plparser/PKGBUILD
deleted file mode 100644
index 22ee81c89..000000000
--- a/testing/totem-plparser/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169150 2012-10-18 19:22:31Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=totem-plparser
-pkgver=3.4.3
-pkgrel=1
-url="http://www.gnome.org"
-pkgdesc="Totem playlist parser library"
-license=('LGPL')
-arch=(i686 x86_64)
-depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b')
-
-build() {
-  cd totem-pl-parser-$pkgver
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
-  make
-}
-
-package(){
-  cd totem-pl-parser-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD
deleted file mode 100644
index e5f3cf652..000000000
--- a/testing/totem/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 169149 2012-10-18 19:22:29Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME3 movie player based on GStreamer"
-url="http://www.gnome.org"
-arch=(i686 x86_64)
-license=(GPL2 custom)
-depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
-         hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst
-         clutter-gtk mx python2-gobject gst-plugins-bad)
-makedepends=(intltool gnome-doc-utils nautilus lirc-utils vala grilo pylint)
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        browser-plugins.ini)
-sha256sums=('e767da34f5212bd9b2d3ea9bc7e3a87b284581ee012214274225dd8decb8fe3e'
-            'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
-
-build() {
-  cd "$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=('gst-plugins-ugly: Extra media codecs'
-              'gst-ffmpeg: Extra media codecs'
-              'lirc-utils: Infrared Remote Control plugin'
-              'grilo-plugins: Browse sidebar (remote media)'
-              'pyxdg: opensubtitles plugin')
-
-  cd "$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
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
-  pkgdesc="Totem plugin for web browsers"
-  depends=("totem=$pkgver")
-  backup=(etc/totem/browser-plugins.ini)
-
-  cd "$pkgbase-$pkgver"
-  make -C browser-plugin \
-    plugindir=/usr/lib/mozilla/plugins \
-    xptdir=/usr/lib/mozilla/plugins \
-    DESTDIR="$pkgdir" install
-  
-  install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
-}
diff --git a/testing/totem/browser-plugins.ini b/testing/totem/browser-plugins.ini
deleted file mode 100644
index cf3014997..000000000
--- a/testing/totem/browser-plugins.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Plugins]
-application/x-shockwave-flash.disabled=true
diff --git a/testing/totem/totem.install b/testing/totem/totem.install
deleted file mode 100644
index 7f0fc704b..000000000
--- a/testing/totem/totem.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/traceroute/PKGBUILD b/testing/traceroute/PKGBUILD
deleted file mode 100644
index fd64bbb31..000000000
--- a/testing/traceroute/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 162017 2012-06-18 20:22:03Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=traceroute
-pkgver=2.0.18
-pkgrel=1
-pkgdesc="Tracks the route taken by packets over an IP network"
-arch=('i686' 'x86_64')
-url="http://traceroute.sourceforge.net/"
-license=('GPL2')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('6bdccfd12f93b89aea53728b3c365db5a4362b6d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix=/usr DESTDIR="${pkgdir}" install
-}
diff --git a/testing/tracker/PKGBUILD b/testing/tracker/PKGBUILD
deleted file mode 100644
index 9d9cde003..000000000
--- a/testing/tracker/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 169619 2012-10-24 17:52:34Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <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.14.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'
-             '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=('7c1ecf3705ecbd2a0278d04277cd1bd8c89d5838913de922fef32321ce67abe4')
-
-build() {
-  cd $pkgbase-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/tracker \
-    --disable-unit-tests \
-    --enable-libflac \
-    --enable-libvorbis
-
-  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_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'
-              '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 $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=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv "$srcdir"/sparql/* "$pkgdir"
-}
diff --git a/testing/tracker/bug675660.patch b/testing/tracker/bug675660.patch
deleted file mode 100644
index 5f217d983..000000000
--- a/testing/tracker/bug675660.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 20 Jul 2012 14:46:33 +0000
-Subject: libtracker-fts: ICU cannot handle complex locale descriptions
-
-ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"),
-not the full definition of your various locale variables and their
-values as returned by glibc's setlocale(LC_ALL, NULL).
-
-Instead, limit ourselves to LC_CTYPE, since after all, that's all we
-need to determine word boundaries.
-
-Fixes GB#675660.
----
-diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
-index 7388f69..69f75ed 100644
---- a/src/libtracker-fts/tracker-parser-libicu.c
-+++ b/src/libtracker-fts/tracker-parser-libicu.c
-@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser,
- 
- 		/* Open word-break iterator */
- 		parser->bi = ubrk_open(UBRK_WORD,
--		                       setlocale (LC_ALL, NULL),
-+		                       setlocale (LC_CTYPE, NULL),
- 		                       parser->utxt,
- 		                       parser->utxt_size,
- 		                       &error);
---
-cgit v0.9.0.2
diff --git a/testing/tracker/tracker-extract-pdf-crash-fix.patch b/testing/tracker/tracker-extract-pdf-crash-fix.patch
deleted file mode 100644
index ac8522f6a..000000000
--- a/testing/tracker/tracker-extract-pdf-crash-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 008677280d32b6db56483832b143760888c91ad4 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam.thursfield@codethink.co.uk>
-Date: Tue, 31 Jul 2012 14:26:53 +0000
-Subject: tracker-extract-pdf: Fix crash if mmap() fails
-
-Patch from Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=751922
----
-diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
-index caa24c7..85066b3 100644
---- a/src/tracker-extract/tracker-extract-pdf.c
-+++ b/src/tracker-extract/tracker-extract-pdf.c
-@@ -451,7 +451,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
- 		len = 0;
- 	} else {
- 		contents = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
--		if (contents == NULL) {
-+		if (contents == NULL || contents == MAP_FAILED) {
- 			g_warning ("Could not mmap pdf file '%s': %s\n",
- 			           filename,
- 			           g_strerror (errno));
---
-cgit v0.9.0.2
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/transcode/PKGBUILD b/testing/transcode/PKGBUILD
deleted file mode 100644
index 7fb798ef7..000000000
--- a/testing/transcode/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 169649 2012-10-25 01:35:43Z eric $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.7
-pkgrel=6
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
-	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool')
-source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
-        ffmpeg-0.11.patch)
-sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae'
-          '3d2dcdc23f14938e87d14cfc03000bb3b649b85e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch"
-  ./configure --prefix=/usr \
-    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
-    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
-    --enable-libdv --enable-libxml2 --enable-v4l \
-    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
-    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
-    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
-  make
-
-  cd "${srcdir}/subtitleripper"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
-  sed -e 's|^\(.*lppm.*\)$|#\1|' \
-      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
-      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
-      -i Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/subtitleripper"
-  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
-  install -m 755 srttool "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
-  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}
diff --git a/testing/transcode/ffmpeg-0.11.patch b/testing/transcode/ffmpeg-0.11.patch
deleted file mode 100644
index b5601fe2f..000000000
--- a/testing/transcode/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c
---- transcode-1.1.7/export/export_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/export/export_ffmpeg.c	2012-07-05 16:22:41.095346080 -0400
-@@ -180,7 +180,7 @@
- 
- 
- /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
--#include <libavcodec/opt.h>
-+#include <libavutil/opt.h>
- #include <libavutil/avstring.h>
- #include <libswscale/swscale.h>
- 
-@@ -470,7 +470,6 @@
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    avcodec_init();
-     avcodec_register_all();
-     TC_UNLOCK_LIBAVCODEC;
- 
-@@ -634,7 +633,6 @@
-         lavc_param_rc_max_rate = 2516;
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
- 
-         break;
- 
-@@ -674,7 +673,6 @@
- 
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
- 
-         break;
- 
-diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c
---- transcode-1.1.7/export/ffmpeg_cfg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/export/ffmpeg_cfg.c	2012-07-05 15:26:29.112103273 -0400
-@@ -160,9 +160,7 @@
-     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
--    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
--    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
-     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -211,7 +211,6 @@
- #else
-     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
- #endif    
--    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
-     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-@@ -223,9 +223,6 @@
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
--    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
--    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
--    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
-     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
-     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c
---- transcode-1.1.7/filter/filter_pp.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/filter/filter_pp.c	2012-07-05 15:26:28.945436613 -0400
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 
-diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c
---- transcode-1.1.7/import/decode_lavc.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/decode_lavc.c	2012-07-05 15:26:28.842103278 -0400
-@@ -181,7 +181,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   lavc_dec_context->error_resilience  = 2;
- #else
--  lavc_dec_context->error_recognition = 2;
-+  lavc_dec_context->err_recognition = 2;
- #endif
-   lavc_dec_context->error_concealment = 3;
-   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c
---- transcode-1.1.7/import/import_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/import_ffmpeg.c	2012-07-05 15:26:28.848769946 -0400
-@@ -314,7 +314,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     lavc_dec_context->error_resilience  = 2;
- #else
--    lavc_dec_context->error_recognition = 2;
-+    lavc_dec_context->err_recognition = 2;
- #endif
-     lavc_dec_context->error_concealment = 3;
-     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c
---- transcode-1.1.7/import/probe_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/probe_ffmpeg.c	2012-07-05 15:26:28.838769947 -0400
-@@ -99,8 +99,8 @@
- 
-     TC_INIT_LIBAVCODEC;
- 
--    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
--                             NULL, 0, NULL);
-+    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
-+                             NULL, NULL);
-     if (ret != 0) {
-         tc_log_error(__FILE__, "unable to open '%s'"
-                                " (libavformat failure)",
-diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h
---- transcode-1.1.7/libtc/tcavcodec.h	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/libtc/tcavcodec.h	2012-07-05 15:26:28.828769951 -0400
-@@ -53,7 +53,6 @@
- 
- #define TC_INIT_LIBAVCODEC do { \
-     TC_LOCK_LIBAVCODEC; \
--    avcodec_init(); \
-     avcodec_register_all(); \
-     TC_UNLOCK_LIBAVCODEC; \
- } while (0)
---- transcode-1.1.7/export/export_ffmpeg.c.orig	2012-10-19 23:25:16.442303175 -0400
-+++ transcode-1.1.7/export/export_ffmpeg.c	2012-10-19 23:26:23.904268733 -0400
-@@ -1249,7 +1249,7 @@
-       return TC_EXPORT_ERROR;
-     }
- 
--    if (lavc_venc_context->codec->encode == NULL) {
-+    if (lavc_venc_context->codec->encode2 == NULL) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
-               "(lavc_venc_context->codec->encode == NULL)");
-       return TC_EXPORT_ERROR;
diff --git a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch b/testing/transcode/subtitleripper-0.3.4-linkingorder.patch
deleted file mode 100644
index 7efe22346..000000000
--- a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:
diff --git a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch
deleted file mode 100644
index 2af11d257..000000000
--- a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:
diff --git a/testing/transmission/PKGBUILD b/testing/transmission/PKGBUILD
deleted file mode 100644
index 97ad12d75..000000000
--- a/testing/transmission/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 166943 2012-09-22 20:42:02Z tomegun $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=transmission
-pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.61
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.transmissionbt.com/"
-license=('MIT')
-makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
-source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
-        transmissiond transmissiond.conf transmission.systemd
-        transmission.tmpfiles)
-
-build() {
-  cd "$pkgbase-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-  pushd qt
-  qmake qtr.pro
-  make
-}
-package_transmission-cli() {
-  pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
-  depends=('curl' 'libevent')
-  backup=('etc/conf.d/transmissiond')
-  install=transmission-cli.install
-
-  cd "$pkgbase-$pkgver"
-
-  for dir in daemon cli web utils
-  do
-      make -C "$dir" DESTDIR="$pkgdir" install
-  done
-
-  install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond"
-  install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
-  install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf"
-  install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service"
-  ln -s transmission.service "$pkgdir/usr/lib/systemd/system/transmissiond.service"
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
-}
-
-package_transmission-gtk() {
-  pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)"
-  depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('notification-daemon: Desktop notification support'
-  	      'transmission-cli: daemon and web support')
-  install=transmission-gtk.install
-
-  cd "$pkgbase-$pkgver"
-
-  make -C gtk DESTDIR="$pkgdir" install
-  make -C po DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
-}
-
-package_transmission-qt() {
-  pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
-  depends=('curl' 'qt' 'libevent')
-  optdepends=('transmission-cli: daemon and web support')
-  install=transmission-qt.install
-
-  cd "$pkgbase-$pkgver"
-
-  make -C qt INSTALL_ROOT="$pkgdir"/usr install
-
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
-  install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
-  install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
-}
-md5sums=('2ed5b7815ebda65223bac6bdb09dec42'
-         '7d6186ee2a852ae3d44980f05063e194'
-         'db72b02fee139e8ab416324e6c044d76'
-         '5c289c8901221a94be74665368ab5c2c'
-         '23f2320361ad54373c3a4551ef634fe8')
diff --git a/testing/transmission/transmission-cli.install b/testing/transmission/transmission-cli.install
deleted file mode 100644
index 8ab275e61..000000000
--- a/testing/transmission/transmission-cli.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  cat << _EOF
-
-  If you want to run the Transmission daemon at boot,
-  add transmissiond to the DAEMONS array in /etc/rc.conf.
-_EOF
-
-post_upgrade
-passwd -l transmission &>/dev/null
-}
-
-post_upgrade() {
-       # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
-       getent group transmission >/dev/null || groupadd -g 169 transmission
-       getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission
-       systemd-tmpfiles --create transmission.conf
-}
diff --git a/testing/transmission/transmission-gtk.install b/testing/transmission/transmission-gtk.install
deleted file mode 100644
index c317fbaca..000000000
--- a/testing/transmission/transmission-gtk.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/transmission/transmission-qt.install b/testing/transmission/transmission-qt.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/transmission/transmission-qt.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/transmission/transmission.systemd b/testing/transmission/transmission.systemd
deleted file mode 100644
index 56ab8f794..000000000
--- a/testing/transmission/transmission.systemd
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Transmission Bit Torrent Daemon
-
-# This assumes that a user 'transmission' exists, with a writeable homedirectory,
-# and that /run/transmission exists and is writeable by the transmission user.
-
-[Service]
-User=transmission
-Type=forking
-PIDFile=/run/transmission/transmission.pid
-ExecStart=/usr/bin/transmission-daemon --pid-file /run/transmission/transmission.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/transmission/transmission.tmpfiles b/testing/transmission/transmission.tmpfiles
deleted file mode 100644
index b603066c1..000000000
--- a/testing/transmission/transmission.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/transmission - transmission transmission -
diff --git a/testing/transmission/transmissiond b/testing/transmission/transmissiond
deleted file mode 100644
index ea3d770f9..000000000
--- a/testing/transmission/transmissiond
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/transmissiond
-
-PID=`pidof -o %PPID /usr/bin/transmission-daemon`
-case "$1" in
-  start)
-    stat_busy "Starting Transmission Daemon"
-    [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}"
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon transmissiond
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Transmission Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon transmissiond
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done
-    $0 start
-    ;;
-  reload)
-      stat_busy "Reloading config"
-      [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-          stat_fail
-      else
-          stat_done
-      fi
-      ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
diff --git a/testing/transmission/transmissiond.conf b/testing/transmission/transmissiond.conf
deleted file mode 100644
index 45a9fd51d..000000000
--- a/testing/transmission/transmissiond.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# example configuration file
-
-# TRANS_USER="transmission"
-# TRANS_ARGS=""
diff --git a/testing/twisted/PKGBUILD b/testing/twisted/PKGBUILD
deleted file mode 100644
index 26514d9f3..000000000
--- a/testing/twisted/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 168885 2012-10-16 11:55:48Z allan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=twisted
-pkgver=12.2.0
-pkgrel=2
-pkgdesc="Asynchronous networking framework written in Python."
-arch=('i686' 'x86_64')
-url="http://twistedmatrix.com/"
-license=('MIT')
-depends=('python2-crypto' 'python2-zope-interface')
-optdepends=('python2-pyopenssl'
-            'python2-soappy: for twisted.web.soap'
-	    'python2-pyasn1: for using conch'
-	    'pygtk: for using manhole'
-	    'tk: for using tkconch')
-install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9')
-
-build() {
-    cd "$srcdir/Twisted-$pkgver"
-    python2 setup.py build
-}
-
-package() {
-    cd "$srcdir/Twisted-$pkgver"
-    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py
-}
diff --git a/testing/twisted/twisted.install b/testing/twisted/twisted.install
deleted file mode 100644
index 8e93ffd3c..000000000
--- a/testing/twisted/twisted.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-}
diff --git a/testing/udisks/PKGBUILD b/testing/udisks/PKGBUILD
deleted file mode 100644
index f7fbd187d..000000000
--- a/testing/udisks/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 165394 2012-08-17 23:23:28Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=udisks
-pkgver=1.0.4
-pkgrel=5
-pkgdesc="Disk Management Service"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
-makedepends=('intltool' 'docbook-xsl')
-options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5'
-            '0b9cbf41935feed3e4e2430fd4e06eb29864554dbb9f330c9d2a5fa2ef185131')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/udisks --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
-  chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh"
-
-  # move udev helpers and rules to /usr/lib
-  mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
-  rm -r "${pkgdir}"/lib
-
-  install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service"
-  echo "SystemdService=udisks.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service"
-}
diff --git a/testing/udisks/udisks.service b/testing/udisks/udisks.service
deleted file mode 100644
index 7105e90be..000000000
--- a/testing/udisks/udisks.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=UDisks
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.UDisks
-ExecStart=/usr/lib/udisks/udisks-daemon
-
-[Install]
-WantedBy=graphical.target
diff --git a/testing/udisks2/PKGBUILD b/testing/udisks2/PKGBUILD
deleted file mode 100644
index 176ef15f3..000000000
--- a/testing/udisks2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169452 2012-10-21 11:36:14Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=udisks2
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="Disk Management Service, version 2"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL2')
-depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
-optdepends=('parted: partition management'
-            'gptfdisk: GUID partition table support')
-options=(!libtool)
-source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb')
-
-build() {
-  cd "udisks-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "udisks-$pkgver"
-  make DESTDIR="$pkgdir" install \
-    bash_completiondir=/usr/share/bash-completion/completions
-}
diff --git a/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
deleted file mode 100644
index 2694334c8..000000000
--- a/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 2 Sep 2012 04:36:13 +0200
-Subject: [PATCH] Send resume signal when built with systemd and using
- pm-utils suspend
-
-This case was apparently overlooked when adding systemd support.
-
-Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
----
- src/linux/up-backend.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
-index ddd4472..52b430e 100644
---- a/src/linux/up-backend.c
-+++ b/src/linux/up-backend.c
-@@ -603,10 +603,11 @@ gboolean
- up_backend_emits_resuming (UpBackend *backend)
- {
- #ifdef HAVE_SYSTEMD
--	return TRUE;
--#else
--	return FALSE;
-+	if (sd_booted ())
-+		return TRUE;
-+	else
- #endif
-+	return FALSE;
- }
- 
- /**
--- 
-1.7.12
-
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
deleted file mode 100644
index 22697257d..000000000
--- a/testing/upower/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165871 2012-09-02 02:46:11Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=upower
-pkgver=0.9.18
-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=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
-options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz
-        0001-Send-resume-signal-when-built-with-systemd-and-using.patch)
-md5sums=('bfaaa1e7f8479fca5594406b3c36dff9'
-         '188afea4919dc324b2efbae35d9d216a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # put udev files in /usr/lib
-  sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-
-  # https://bugs.freedesktop.org/show_bug.cgi?id=54371
-  patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/usbmuxd/85-usbmuxd.rules b/testing/usbmuxd/85-usbmuxd.rules
deleted file mode 100644
index ec9f72501..000000000
--- a/testing/usbmuxd/85-usbmuxd.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
-
-# Forces iDevices to the last USB configuration and runs usbmuxd
-TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
-LABEL="usbmuxd_systemd_end"
-
-# Exit usbmuxd when the last device is removed
-ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/testing/usbmuxd/PKGBUILD b/testing/usbmuxd/PKGBUILD
deleted file mode 100644
index 6385ba910..000000000
--- a/testing/usbmuxd/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 164299 2012-07-29 23:16:20Z tomegun $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=usbmuxd
-pkgver=1.0.8
-pkgrel=1
-pkgdesc="USB Multiplex Daemon"
-url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'GPL3' 'LGPL2.1')
-depends=('libusb' 'libplist')
-makedepends=('cmake')
-install=usbmuxd.install
-source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
-	'usbmuxd.service'
-	'85-usbmuxd.rules')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  echo "${pkgver}" > version.tag
-  mkdir build
-  cd build
-  cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  # fix udev dir being hardcoded
-  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
-  rmdir "${pkgdir}/lib"
-  # install systemd service file
-  install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
-  # use udev rule that works with systemd
-  install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
-}
-md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
-         'dae0660f972510a6483992b5b81e1b5a'
-         'dc4b2893651149eccbf7b2c8467cd288')
diff --git a/testing/usbmuxd/usbmuxd.install b/testing/usbmuxd/usbmuxd.install
deleted file mode 100644
index 1a4859674..000000000
--- a/testing/usbmuxd/usbmuxd.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-    groupadd -g 140 usbmux &>/dev/null
-    useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-    passwd -l usbmux &>/dev/null
-}
-
-post_upgrade() {
-    getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null
-    getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-}
-
-post_remove() {
-    if getent passwd usbmux >/dev/null 2>&1; then
-        userdel usbmux
-    fi
-    if getent group usbmux >/dev/null 2>&1; then
-        groupdel usbmux
-    fi
-}
diff --git a/testing/usbmuxd/usbmuxd.service b/testing/usbmuxd/usbmuxd.service
deleted file mode 100644
index fbebf65b9..000000000
--- a/testing/usbmuxd/usbmuxd.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=iOS USB Muxer
-
-[Service]
-ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux
diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD
deleted file mode 100644
index ac171a037..000000000
--- a/testing/usbutils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 163167 2012-07-08 10:08:11Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
-pkgname=usbutils
-pkgver=006
-pkgrel=1
-pkgdesc="USB Device Utilities"
-arch=(i686 x86_64)
-license=('GPL')
-groups=('base')
-depends=('libusb' 'hwids')
-optdepends=('python2: for lsusb.py usage'
-            'coreutils: for lsusb.py usage')
-url="http://linux-usb.sourceforge.net/"
-source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz"
-        fix-python2.patch)
-md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8'
-         '45766196895b4cc50b53cd56e1bbf3d1')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # patch lsusb.py to use correct usb.ids file and python2 interpreter
-  patch -Np1 -i $srcdir/fix-python2.patch
-  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  # this is now in the hwids package
-  rm -rf $pkgdir/usr/{share/hwdata,sbin}
-}
diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch
deleted file mode 100644
index 7e2875e99..000000000
--- a/testing/usbutils/fix-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- usbutils-002/lsusb.py	2010-12-16 01:07:09.000000000 +0100
-+++ usbutils-002/lsusb.py	2011-04-09 22:43:59.043828595 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # lsusb.py
- # Displays your USB devices in reasonable form.
- # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3.
-@@ -16,7 +16,7 @@
- warnsort = False
- 
- prefix = "/sys/bus/usb/devices/"
--usbids = "/usr/share/usb.ids"
-+usbids = "/usr/share/hwdata/usb.ids"
- 
- esc = chr(27)
- norm = esc + "[0;0m"
diff --git a/testing/usermin/PKGBUILD b/testing/usermin/PKGBUILD
deleted file mode 100644
index 6e5eb6289..000000000
--- a/testing/usermin/PKGBUILD
+++ /dev/null
@@ -1,134 +0,0 @@
-# $Id: PKGBUILD 169457 2012-10-21 13:56:26Z tomegun $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=usermin
-pkgver=1.520
-pkgrel=2
-pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding"
-arch=(i686 x86_64)
-license=('custom:usermin')
-url="http://www.webmin.com/"
-depends=('perl' 'webmin')
-makedepends=('perl-net-ssleay')
-backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
-'etc/usermin/at/config' \
-'etc/usermin/man/config' \
-'etc/usermin/ssh/config' \
-'etc/usermin/chfn/config' \
-'etc/usermin/cron/config' \
-'etc/usermin/file/config' \
-'etc/usermin/plan/config' \
-'etc/usermin/proc/config' \
-'etc/usermin/spam/config' \
-'etc/usermin/htaccess/config' \
-'etc/usermin/cshrc/config' \
-'etc/usermin/gnupg/config' \
-'etc/usermin/mysql/config' \
-'etc/usermin/quota/config' \
-'etc/usermin/shell/config' \
-'etc/usermin/theme/config' \
-'etc/usermin/mailbox/config' \
-'etc/usermin/schedule/config' \
-'etc/usermin/config' \
-'etc/usermin/commands/config' \
-'etc/usermin/htaccess-htpasswd/config' \
-'etc/usermin/forward/config' \
-'etc/usermin/telnet/config' \
-'etc/usermin/tunnel/config' \
-'etc/usermin/updown/config' \
-'etc/usermin/procmail/config' \
-'etc/usermin/fetchmail/config' \
-'etc/usermin/changepass/config' \
-'etc/usermin/language/config' \
-'etc/usermin/postgresql/config' \
-'etc/usermin/usermount/config' \
-)
-install=usermin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	usermin.rc 
-	usermin.service
-	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-    
-  # remove modules we do not support
-
-  #remove config files from other distros
-  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
-  # remove caldera theme
-  rm -rf caldera
-
-  # remove init-scripts from other distros
-  rm usermin-init
-  rm usermin-daemon
-
-  # setting perl path
-  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
-  # create dirs
-  mkdir -p $startdir/pkg/opt/usermin
-  mkdir -p $startdir/pkg/var/log/usermin
-  mkdir -p $startdir/pkg/etc/usermin
-  
-  # install pam stuff
-  install -D -m 644 usermin-pam $startdir/pkg/etc/pam.d/usermin
-  
-  # remove other distros and add only Archlinux don't change next line else it will not work!
-  rm os_list.txt
-  echo 'Archlinux			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
-  # copy stuff to right dirs
-  cd $startdir/src/$pkgname-$pkgver
-  cp -rp * $startdir/pkg/opt/usermin
-  cd $startdir/src/usermin-config
-  cp -rfp * $startdir/pkg/opt/usermin
-
-  # define parameters for setup.sh
-  config_dir=$startdir/pkg/etc/usermin
-  var_dir=$startdir/pkg/var/log/usermin
-  perl=/usr/bin/perl
-  autoos=1
-  port=20000
-  login=root
-  crypt="XXX"
-  ssl=1
-  atboot=0
-  nostart=1
-  nochown=1
-  autothird=1
-  nouninstall=1
-  noperlpath=1
-  atbootyn=n
-  tempdir=$startdir/pkg/tmp
-  export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
-  
-  # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/usermin/setup.sh
-  $startdir/pkg/opt/usermin/setup.sh
-  
-  # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' $startdir/pkg/etc/usermin/miniserv.conf
-  find $startdir/pkg/etc/usermin -type f -exec sed -i "s:$startdir/pkg::g" {} \; 
-  
-  # make it only accessible by localhost
-  echo 'allow=127.0.0.1' >> $startdir/pkg/etc/usermin/miniserv.conf
-  
-  # enable user and password login
-  sed -i -e '/localauth/d' $startdir/pkg/etc/usermin/miniserv.conf
-
-  #install systemd service file
-  install -D -m 644 $startdir/src/usermin.service $startdir/pkg/usr/lib/systemd/system/usermin.service
- 
- #install rc file
-  install -D -m 755 $startdir/src/usermin.rc $startdir/pkg/etc/rc.d/usermin
-
-  # delete temp dir
-  rm -r $startdir/pkg/tmp
-  #install license
-  install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE
-}
-md5sums=('5819ba87796d9373a92116e90d1a35d4'
-         'cfef4490cd1ef9517c0b39a7bd75c968'
-         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
-         'ec37a79f948f778224550930d2a7ca07')
diff --git a/testing/usermin/usermin-config.tar.bz2 b/testing/usermin/usermin-config.tar.bz2
deleted file mode 100644
index 056bb6298..000000000
--- a/testing/usermin/usermin-config.tar.bz2
+++ /dev/null
diff --git a/testing/usermin/usermin.install b/testing/usermin/usermin.install
deleted file mode 100644
index 3ace10ea2..000000000
--- a/testing/usermin/usermin.install
+++ /dev/null
@@ -1,34 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-  crypt=${crypt//\\/\\\\}
-  crypt=${crypt//\//\\\/}
-  sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make usermin start at boot time, add usermin to rc.conf daemons
-==> Point your web browser to http://localhost:20000 to use usermin.
-==> To change the modules setup please use webmin.
-
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
-  cd /opt/usermin/man
-  gzip -df $(find . -name '*.gz')
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  # uninstall unzipped files
-  rm -r /opt/usermin/man
-}
diff --git a/testing/usermin/usermin.rc b/testing/usermin/usermin.rc
deleted file mode 100644
index af365780a..000000000
--- a/testing/usermin/usermin.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start=/etc/usermin/start
-stop=/etc/usermin/stop
-lockfile=/var/lock/usermin
-
-case "$1" in
-'start')
-     stat_busy "Starting Usermin daemon"
-     $start >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     touch $lockfile >/dev/null 2>&1
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'stop')
-     stat_busy "Stopping Usermin daemon"
-     $stop >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     rm -f $lockfile
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'restart')
-     $stop && $start
-     RETVAL=$?
-;;
-*)
-echo "Usage: $0 { start | stop | restart }"
-RETVAL=1
-;;
-esac
-exit $RETVAL
\ No newline at end of file
diff --git a/testing/usermin/usermin.service b/testing/usermin/usermin.service
deleted file mode 100644
index e91164c63..000000000
--- a/testing/usermin/usermin.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Usermin
-
-[Service]
-Type=forking
-ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
deleted file mode 100644
index 2ff907d39..000000000
--- a/testing/util-linux/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 168617 2012-10-13 12:08:22Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=util-linux
-pkgver=2.22.1
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('pam' 'shadow')
-makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1
-conflicts=('util-linux-ng' 'eject')
-provides=("util-linux-ng=${pkgver}" 'eject')
-license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz
-        uuidd.tmpfiles
-        pam-login
-        pam-common
-        pam-su)
-backup=(etc/pam.d/chfn
-        etc/pam.d/chsh
-        etc/pam.d/login
-        etc/pam.d/su
-        etc/pam.d/su-l)
-install=util-linux.install
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib \
-              --localstatedir=/run \
-              --enable-fs-paths-extra=/usr/bin:/usr/sbin \
-              --enable-raw \
-              --enable-vipw \
-              --enable-newgrp \
-              --enable-chfn-chsh \
-              --enable-write \
-              --enable-mesg \
-              --enable-socket-activation
-
-#              --enable-reset \ # part of ncurses
-#              --enable-line \ # not part of any package
-#              --enable-last \ # not compat
-
-  make
-}
-
-#check() {
-# fails for some reason in chroot, works outside
-#  make -C "$pkgname-$pkgver" check
-#}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-
-  # setuid chfn and chsh
-  chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
-
-  # install PAM files for login-utils
-  install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
-  install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
-  install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
-  install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su"
-  install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l"
-
-  # include tmpfiles fragment for uuidd
-  # TODO(dreisner): offer this upstream?
-  install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
-}
-md5sums=('730cf9932531ed09b53a04ca30fcb4c9'
-         'a39554bfd65cccfd8254bb46922f4a67'
-         '4368b3f98abd8a32662e094c54e7f9b1'
-         'a31374fef2cba0ca34dfc7078e2969e4'
-         'fa85e5cce5d723275b14365ba71a8aad')
diff --git a/testing/util-linux/hwclock-systz.patch b/testing/util-linux/hwclock-systz.patch
deleted file mode 100644
index 79ed1a5f3..000000000
--- a/testing/util-linux/hwclock-systz.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 46a8834c2eb9b0c37d92e30d1a262e41306cf36f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Wed, 19 Sep 2012 18:10:34 +0200
-Subject: [PATCH 1/2] hwclock: don't warp the systemtime if it is in UTC
-
-A sideeffect of 839be2ba6b44fa9dc927f081d547ebadec9de19c is that we now
-warp the systemtime according to the timezone, on the first call of
---systz. This is not always the correct thing to do, and causes a
-regression for us in Arch Linux.
-
-This is the correct thing to do if the RTC, and hence the systemtime is
-set in localtime. However, if the systemtime is already in UTC we don't
-want to touch it when we set the kernel timezone (which we still need to
-do as e.g. FAT stores timestamps in localtime).
-
-An almost identical issue was also fixed in systemd commit
-72edcff5db936e54cfc322d9392ec46e2428fd9b.
-
-Fixes:
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- sys-utils/hwclock.8 | 11 +++++++----
- sys-utils/hwclock.c | 17 +++++++++++++++--
- 2 files changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/sys-utils/hwclock.8 b/sys-utils/hwclock.8
-index 07d9fc0..5c599ad 100644
---- a/sys-utils/hwclock.8
-+++ b/sys-utils/hwclock.8
-@@ -58,10 +58,12 @@ This is a good option to use in one of the system startup scripts.
- Set the Hardware Clock to the current System Time.
- .TP
- .B \-\-systz
--Reset the System Time based on the current timezone.
-+Set the kernel's timezone and reset the System Time based on the current timezone.
- 
--Also set the kernel's timezone value to the local timezone
--as indicated by the TZ environment variable and/or
-+The system time is only reset on the first call after boot.
-+
-+The local timezone is taken to be what is
-+indicated by the TZ environment variable and/or
- .IR /usr/share/zoneinfo ,
- as
- .BR tzset (3)
-@@ -74,7 +76,8 @@ This is an alternate option to
- .B \-\-hctosys
- that does not read the hardware clock, and may be used in system startup
- scripts for recent 2.6 kernels where you know the System Time contains
--the Hardware Clock time.
-+the Hardware Clock time. If the Hardware Clock is already in UTC, it is
-+not reset.
- .TP
- .B \-\-adjust
- Add or subtract time from the Hardware Clock to account for systematic
-diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
-index 5a4c87e..351ce1f 100644
---- a/sys-utils/hwclock.c
-+++ b/sys-utils/hwclock.c
-@@ -772,7 +772,6 @@ static int set_system_clock_timezone(const bool universal, const bool testing)
- 	struct timeval tv;
- 	struct tm *broken;
- 	int minuteswest;
--	int rc;
- 
- 	gettimeofday(&tv, NULL);
- 	if (debug) {
-@@ -818,10 +817,24 @@ static int set_system_clock_timezone(const bool universal, const bool testing)
- 		       ("Not setting system clock because running in test mode.\n"));
- 		retcode = 0;
- 	} else {
-+		const struct timezone tz_utc = { 0, 0 };
- 		const struct timezone tz = { minuteswest, 0 };
- 		const struct timeval *tv_null = NULL;
-+		int rc = 0;
-+
-+		/* The first call to settimeofday after boot will assume the systemtime
-+		 * is in localtime, and adjust it according to the given timezone to
-+		 * compensate. If the systemtime is in fact in UTC, then this is wrong
-+		 * so we first do a dummy call to make sure the time is not shifted.
-+		 */
-+		if (universal)
-+			rc = settimeofday(tv_null, &tz_utc);
-+
-+		/* Now we set the real timezone. Due to the above dummy call, this will
-+		 * only warp the systemtime if the RTC is not in UTC. */
-+		if (!rc)
-+			rc = settimeofday(tv_null, &tz);
- 
--		rc = settimeofday(tv_null, &tz);
- 		if (rc) {
- 			if (errno == EPERM) {
- 				warnx(_
--- 
-1.7.12.1
-
diff --git a/testing/util-linux/pam-common b/testing/util-linux/pam-common
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/testing/util-linux/pam-common
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/testing/util-linux/pam-login b/testing/util-linux/pam-login
deleted file mode 100644
index 1960d9497..000000000
--- a/testing/util-linux/pam-login
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-
-auth       required     pam_securetty.so
-auth       requisite    pam_nologin.so
-auth       include      system-local-login
-account    include      system-local-login
-session    include      system-local-login
diff --git a/testing/util-linux/pam-su b/testing/util-linux/pam-su
deleted file mode 100644
index cf15f40f1..000000000
--- a/testing/util-linux/pam-su
+++ /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/util-linux/su.1 b/testing/util-linux/su.1
deleted file mode 100644
index 59e17314d..000000000
--- a/testing/util-linux/su.1
+++ /dev/null
@@ -1,230 +0,0 @@
-.TH SU "1" "June 2012" "util-linux" "User Commands"
-.SH NAME
-su \- run a command with substitute user and group ID
-.SH SYNOPSIS
-.B su
-[options...] [\-] [user [args...]]
-.SH DESCRIPTION
-.B su
-allows to run commands with substitute user and group ID.
-.PP
-When called without arguments
-.B su
-defaults to running an interactive shell as
-.IR root .
-.PP
-For backward compatibility
-.B su
-defaults to not change the current directory and to only set the
-environment variables
-.B HOME
-and
-.B SHELL
-(plus
-.B USER
-and
-.B LOGNAME
-if the target
-.I user
-is not root).  It is recommended to always use the
-.B \-\-login
-option (instead it's shortcut
-.BR \- )
-to avoid side effects caused by mixing environments.
-.PP
-This version of
-.B su
-uses PAM for authentication, account and session management.  Some
-configuration options found in other
-.B su
-implementations such as e.g. support of a wheel group have to be
-configured via PAM.
-.SH OPTIONS
-.TP
-\fB\-c\fR \fIcommand\fR, \fB\-\-command\fR=\fIcommand\fR
-Pass
-.I command
-to the shell with the
-.B \-c
-option.
-.TP
-\fB\-\-session\-command\fR=\fIcommand\fR
-Same as
-.B \-c
-but do not create a new session (discouraged).
-.TP
-\fB\-f\fR, \fB\-\-fast\fR
-Pass
-.B \-f
-to the shell which may or may not be useful depending on the
-shell.
-.TP
-\fB\-g\fR, \fB\-\-group\fR=\fIgroup\fR\fR
-specify the primary group, this option is allowed for root user only
-.TP
-\fB\-G\fR, \fB\-\-supp-group\fR=\fIgroup\fR\fR
-specify a supplemental group, this option is allowed for root user only
-.TP
-\fB\-\fR, \fB\-l\fR, \fB\-\-login\fR
-Starts the shell as login shell with an environment similar to a real
-login:
-.RS 10
-.TP
-o
-clears all environment variables except for
-.B TERM
-.TP
-o
-initializes the environment variables
-.BR HOME ,
-.BR SHELL ,
-.BR USER ,
-.BR LOGNAME ,
-.B PATH
-.TP
-o
-changes to the target user's home directory
-.TP
-o
-sets argv[0] of the shell to
-.RB ' \- '
-in order to make the shell a login shell
-.RE
-.TP
-\fB\-m\fR, \fB\-p\fR, \fB\-\-preserve-environment\fR
-Preserves the whole environment, ie does not set
-.BR HOME ,
-.BR SHELL ,
-.B USER
-nor
-.BR LOGNAME .
-.TP
-\fB\-s\fR \fISHELL\fR, \fB\-\-shell\fR=\fISHELL\fR
-Runs the specified shell instead of the default.  The shell to run is
-selected according to the following rules in order:
-.RS 10
-.TP
-o
-the shell specified with
-.B \-\-shell
-.TP
-o
-The shell specified in the environment variable
-.B SHELL
-if the
-.B \-\-preserve-environment
-option is used.
-.TP
-o
-the shell listed in the passwd entry of the target user
-.TP
-o
-/bin/sh
-.RE
-.IP
-If the target user has a restricted shell (i.e. not listed in
-/etc/shells) the
-.B \-\-shell
-option and the
-.B SHELL
-environment variables are ignored unless the calling user is root.
-.TP
-\fB\-\-help\fR
-Display help text and exit.
-.TP
-\fB\-\-version\fR
-Display version information and exit.
-.SH CONFIG FILES
-.B su
-reads the
-.I /etc/default/su
-and
-.I /etc/login.defs
-configuration files.  The following configuration items are relevant
-for
-.BR su (1):
-.PP
-.B FAIL_DELAY
-(number)
-.RS 4
-Delay in seconds in case of authentication failure.  Number must be
-a non-negative integer.
-.RE
-.PP
-.B ENV_PATH
-(string)
-.RS 4
-Defines the PATH environment variable for a regular user.  The
-default value is
-.IR /usr/local/bin:\:/bin:\:/usr/bin .
-.RE
-.PP
-.B ENV_ROOTPATH
-(string)
-.br
-.B ENV_SUPATH
-(string)
-.RS 4
-Defines the PATH environment variable for root. The default value is
-.IR /usr/local/sbin:\:/usr/local/bin:\:/sbin:\:/bin:\:/usr/sbin:\:/usr/bin .
-.RE
-.PP
-.B ALWAYS_SET_PATH
-(boolean)
-.RS 4
-If set to
-.I yes
-and \-\-login and \-\-preserve\-environment were not specified
-.B su
-initializes
-.BR PATH .
-.RE
-.SH EXIT STATUS
-.B su
-normally returns the exit status of the command it executed.  If the
-command was killed by a signal,
-.B su
-returns the number of the signal plus 128.
-.PP
-Exit status generated by
-.B su
-itself:
-.RS 10
-.TP
-1
-Generic error before executing the requested command
-.TP
-126
-The requested command could not be executed
-.TP
-127
-The requested command could was not found
-.RE
-.SH FILES
-.PD 0
-.TP 17
-/etc/pam.d/su
-default PAM configuration file
-.TP
-/etc/pam.d/su-l
-PAM configuration file if \-\-login is specified
-.TP
-/etc/default/su
-command specific logindef config file
-.TP
-/etc/login.defs
-global logindef config file
-.PD 1
-.SH "SEE ALSO"
-.BR pam (8),
-.BR shells (5),
-.BR login.defs (5)
-.SH AUTHOR
-Derived from coreutils' su which was based on an implementation from
-David MacKenzie.
-.SH AVAILABILITY
-The su command is part of the util-linux package and is
-available from
-.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
-Linux Kernel Archive
-.UE .
diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install
deleted file mode 100644
index 969a4aecf..000000000
--- a/testing/util-linux/util-linux.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  # we don't want use systemd-tmpfiles here because
-  # the package dependency would create a circular dep.
-  if [ ! -d run/uuidd ]; then
-    install -o uuidd -g uuidd -dm755 run/uuidd
-  fi
-}
-
-post_upgrade() {
-  if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
-    if [ -f /var/lib/hwclock/adjtime ]; then
-      mv /var/lib/hwclock/adjtime /etc/adjtime
-    fi
-    if [ -d /var/lib/hwclock ]; then
-      rmdir /var/lib/hwclock
-    fi
-  fi
-
-  post_install
-}
diff --git a/testing/util-linux/uuidd.tmpfiles b/testing/util-linux/uuidd.tmpfiles
deleted file mode 100644
index b059cfe65..000000000
--- a/testing/util-linux/uuidd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/uuidd 0755 uuidd uuidd
diff --git a/testing/vala/PKGBUILD b/testing/vala/PKGBUILD
deleted file mode 100644
index d31f8101b..000000000
--- a/testing/vala/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169146 2012-10-18 19:22:19Z jgc $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-
-pkgname=vala
-pkgver=0.18.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/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('18cb2220ce7352a9dd71be058530f7d4a6c8215a1d9c471430af60a04496a60b')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --enable-vapigen
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD
deleted file mode 100644
index c2da0713a..000000000
--- a/testing/valgrind/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 162945 2012-07-04 01:13:31Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=valgrind
-pkgver=3.7.0
-pkgrel=3
-pkgdesc="A tool to help find memory-management problems in programs"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://valgrind.org/"
-depends=('glibc>=2.16' 'glibc<2.17' 'perl')
-makedepends=('gdb')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.7.0-glibc-2.16.patch)
-md5sums=('a855fda56edf05614f099dca316d1775'
-         '8362c9c10b8d7d08d1be628a717cfba7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
-  else
-    ./configure --prefix=/usr --mandir=/usr/share/man
-  fi
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch b/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch
deleted file mode 100644
index 4d28ff11a..000000000
--- a/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
---- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
-+++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,28 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.15)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
-+$as_echo "2.15 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_15 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+
-+     2.16)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5
-+$as_echo "2.16 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_16 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+
-      darwin)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-@@ -6422,7 +6433,7 @@
-      *)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
--	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
-+	as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
- 	as_fn_error "or Darwin libc" "$LINENO" 5
- 	;;
- esac
diff --git a/testing/vde2/PKGBUILD b/testing/vde2/PKGBUILD
deleted file mode 100644
index 1f706ffa1..000000000
--- a/testing/vde2/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 168886 2012-10-16 11:55:53Z allan $
-# Contributor: Sergej Pupykin
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=vde2
-pkgver=2.3.2
-pkgrel=2
-pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
-url="http://sourceforge.net/projects/vde/"
-license=("GPL" "LGPL" "CUSTOM")
-arch=('i686' 'x86_64')
-depends=('bash' 'libpcap' 'openssl')
-makedepends=('python')
-backup=(etc/conf.d/vde)
-source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
-        dhcpd.conf.sample
-        iptables.rules.sample
-        vde-config.sample
-        vde-connection.sample
-        vde.conf
-        vde.rc)
-install=vde2.install
-options=(!libtool !makeflags)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
-             --enable-experimental
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver 
-  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install
-  install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde
-  install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde
-  install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample
-  install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample
-  install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample
-  install -D -m 644 ../iptables.rules.sample $pkgdir/usr/share/vde2/iptables.rules.sample
-  # install slirp license
-  install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde
-}
-
-md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
-         '7d9bc56d2e561d849e915000d1c0f269'
-         'a920123fc620bcedbccb703a8d1bdc55'
-         'cb8ace28e8efd4dad128be4be71b3b07'
-         '63033c33565e2030541c5e05e9d9b063'
-         'a22730f051f4840da4a3162a88ff8156'
-         '6c7dc01bc2f039f0ff1682ee70d3d1da')
diff --git a/testing/vde2/dhcpd.conf.sample b/testing/vde2/dhcpd.conf.sample
deleted file mode 100644
index 565a78b27..000000000
--- a/testing/vde2/dhcpd.conf.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-ddns-update-style none;
-
-subnet 192.168.254.0 netmask 255.255.255.0 {
-    range 192.168.254.1 192.168.254.253;
-    option routers 192.168.254.254;
-    option domain-name "virtual.example.com";
-    # find your DNS servers from /etc/resolv.conf
-    # otherwise only pure IP addresses will work
-    option domain-name-servers 192.168.254.254;
-    option broadcast-address 192.168.254.255;
-    default-lease-time 86400;
-}
diff --git a/testing/vde2/iptables.rules.sample b/testing/vde2/iptables.rules.sample
deleted file mode 100644
index ac712ee21..000000000
--- a/testing/vde2/iptables.rules.sample
+++ /dev/null
@@ -1,5 +0,0 @@
-*filter
--A INPUT -i tun -j ACCEPT
--A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT
-*nat
--A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE
diff --git a/testing/vde2/vde-config.sample b/testing/vde2/vde-config.sample
deleted file mode 100644
index c5a5b7d88..000000000
--- a/testing/vde2/vde-config.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# Set options vde_switch program
-# To activate this vde profile add it to /etc/conf.d/vde
-
-# Global options
-VDE_NUMPORTS="32"  # Number of ports (default 32)
-VDE_HUB="no"       # [yes|no] Make the switch act as a hub
-VDE_FSTP="no"      # [yes|no] Activate the fast spanning tree protocol
-VDE_MAC=""         # Set the Switch MAC address
-VDE_PRIOTIRY=""    # Set the priority for FST (MAC extension)
-VDE_HASHSIZE=""    # Hash table size
-
-# Options from datasock module
-VDE_SOCK="/var/run/vde/sample.sock"  # control directory pathname
-VDE_SOCK_MODE="660"                  # Standard access mode for comm sockets (octal)
-VDE_SOCK_GROUP="root"                # Group owner for comm sockets
-
-# Options from consmgmt module
-VDE_MANAGEMENT_SOCK="/var/run/vde/sample.mgmt"  # path of the management UNIX socket
-VDE_MANAGEMENT_SOCK_MODE="660"                  # management UNIX socket access mode (octal)
-
-# Other options to parse to vde_switch
-VDE_OPTIONS=""
-
-# VDE with internet support
-# You can use either tuntap method or slirpvde method.
-
-# Options from tuntap module
-VDE_TAP=""  # Enable routing through TAP tap interface (comma separated array eg.:"tap0,tap1").
-
-# slirpvde daemon support
-SLIRP="no"         # [yes|no] enable/disable SLIRP daemon support
-SLIRP_DHCP="no"    # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE
-SLIRP_NETWORK="" # specify the network address (default 10.0.2.0)
-# other options to parse to slirpvde
-SLIRP_OPTIONS=""
\ No newline at end of file
diff --git a/testing/vde2/vde-connection.sample b/testing/vde2/vde-connection.sample
deleted file mode 100644
index 4a75e1f52..000000000
--- a/testing/vde2/vde-connection.sample
+++ /dev/null
@@ -1,6 +0,0 @@
-# You can add vde switch connections below
-# just without the # at the beginning:
-# vde_plug /var/run/vde/sample.sock = vde_plug /var/run/vde/sample2.sock
-# or if hosts are different use this syntax:
-# vde_plug /var/run/vde/sample.sock = ssh host2 vde_plug /var/run/vde/sample.sock
-
diff --git a/testing/vde2/vde.conf b/testing/vde2/vde.conf
deleted file mode 100644
index bc61dceda..000000000
--- a/testing/vde2/vde.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set options for a vde daemon script
-#
-# Array for your vde config files, eg.: "internal-net external-net"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-config.sample
-VDE_CONFIG="" 
-
-# Array for your dpipe connections, eg.: "connect-switches"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-connection.sample
-VDE_CONNECTION=""
\ No newline at end of file
diff --git a/testing/vde2/vde.rc b/testing/vde2/vde.rc
deleted file mode 100755
index b368f9955..000000000
--- a/testing/vde2/vde.rc
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vde
-
-case "$1" in
-  start)
-    # bring up all defined profiles
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      stat_busy "Starting vde_switch $i"
-      # get options from profile
-      [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS"
-      [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x"
-      [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F"
-      [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC"
-      [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY"
-      [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH"
-      [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK"
-      [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE"
-      [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP"
-      [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK"
-      [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE"
-      [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP"
-      [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS"
-      vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null
-      [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK"
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Starting slirpvde for $i"
-        [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D"
-        [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK"
-        [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS"
-        [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK"
-        [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE"
-        [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP"
-        slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        unset OPTIONS
-        unset SP_OPTIONS
-      fi
-    done
-    for i in $VDE_CONNECTION; do
-      # connect specified vde_switches
-      if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then
-        stat_busy "Connecting VDE switches $i together..."
-        while read j; do
-          switch="$(echo $j | grep ^vde_plug)"
-          [ -n "$switch" ] && (dpipe $switch &)
-        done </etc/vde/$i
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      fi
-    done
-    add_daemon vde
-    ;;
-  stop)
-    # kill vde_plug if switches are connected
-    [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Stopping slirpvde for $i"
-        kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        rm /var/run/slirpvde-$i.pid &> /dev/null
-      fi
-      stat_busy "Stopping vde_switch $i"
-      kill $(cat /var/run/vde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      rm /var/run/vde-$i.pid &> /dev/null
-      stat_busy "Removing $i vde sockets"
-      rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-    done
-      unset OPTIONS
-      unset SP_OPTIONS
-      [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out
-      rm_daemon vde 
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-    *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/vde2/vde2.install b/testing/vde2/vde2.install
deleted file mode 100644
index 74e1710ff..000000000
--- a/testing/vde2/vde2.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  echo "Change /etc/conf.d/vde to your needs."
-  echo "vde config files should be placed in /etc/vde, sample files are provided."
-  echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'."
-  echo "Merge those examples, if needed to the according config files."
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD
deleted file mode 100644
index 1e6a3df88..000000000
--- a/testing/vinagre/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169145 2012-10-18 19:22:16Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=vinagre
-pkgver=3.6.1
-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=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
-optdepends=('openssh: SSH plugin'
-            'rdesktop: RDP plugin')
-makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('768727f9833ba9b9879d72671bc4b10577f4dfe74488cb0cf4c49edfe0165c62')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install
deleted file mode 100644
index 4998e6e8b..000000000
--- a/testing/vinagre/vinagre.install
+++ /dev/null
@@ -1,14 +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
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD
deleted file mode 100644
index 282971898..000000000
--- a/testing/vino/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169285 2012-10-18 19:46:05Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vino
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager' 'gnome-common')
-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=('60fdc2271e27c4e10bef40dc2ee836d587930a178c3f189bd975c4d477f32783')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vino \
-      --localstatedir=/var \
-      --disable-http-server --with-secret
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/vino/vino.install b/testing/vino/vino.install
deleted file mode 100644
index fabaa1ed7..000000000
--- a/testing/vino/vino.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD
deleted file mode 100644
index 6b303a952..000000000
--- a/testing/vlc/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 163068 2012-07-06 15:22:25Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=2.0.2
-pkgrel=2
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
-         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
-         'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 
-         'xcb-util-keysyms' 'ttf-freefont')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils'
-             'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
-             'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards'
-            'libbluray: for Blu-Ray support'
-            'flac: for Free Lossless Audio Codec plugin'
-            'oss: for OSS audio support'
-            'portaudio: for portaudio support'
-            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'projectm: for ProjectM visualisation plugin'
-            'libcaca: for colored ASCII art video output'
-            'libgme: for libgme plugin'
-            'librsvg: for SVG plugin'
-            'gnome-vfs: for GNOME Virtual File System support'
-            'libgoom2: for libgoom plugin'
-            'vcdimager: navigate VCD with libvcdinfo'
-            'xosd: for xosd support'
-            'aalib: for ASCII art plugin'
-            'libmtp: for MTP devices support'
-            'fluidsynth: for synthesizer MIDI FluidSynth'
-            'smbclient: for SMB access plugin'
-            'libcdio: for audio CD playback support')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool' '!emptydirs')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('93e729cc970a4535b3213dbef0e69528')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-oss \
-              --enable-faad \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --enable-realrtsp \
-              --enable-xosd \
-              --enable-aa \
-              --enable-vcdx
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}
diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install
deleted file mode 100644
index dc4961cae..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 a6eae68f2..000000000
--- a/testing/vte3/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 169144 2012-10-18 19:22:14Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=vte3
-pkgname=(vte3 vte-common)
-pkgver=0.34.1
-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/${pkgver%.*}/vte-$pkgver.tar.xz)
-sha256sums=('06b78824875545ced8ebaff111b656d0b4ed370f46a4b609f43f88a0ee908f08')
-
-build() {
-  cd "vte-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vte \
-      --localstatedir=/var --disable-static \
-      --enable-introspection
-  make
-}
-
-package_vte3(){
-  depends=('gtk3' 'vte-common')
-  cd "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"
-  depends=('glibc')
-  cd "vte-$pkgver"
-
-  make -C gnome-pty-helper DESTDIR="$pkgdir" install
-}
diff --git a/testing/webkitgtk/PKGBUILD b/testing/webkitgtk/PKGBUILD
deleted file mode 100644
index d77de3a00..000000000
--- a/testing/webkitgtk/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=webkitgtk
-pkgname=('webkitgtk2' 'webkitgtk3')
-pkgver=1.10.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
-options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493')
-
-build() {
-  cd "$srcdir/webkitgtk-$pkgver"
-  mkdir build-gtk2 build-gtk3
-
-  cd build-gtk2
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk2 \
-    --with-gstreamer=1.0 \
-    --with-gtk=2.0 \
-    --disable-webkit2
-  make all stamp-po
-  
-  cd ../build-gtk3
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk3 \
-    --with-gstreamer=1.0
-  make all stamp-po
-}
-
-package_webkitgtk3() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs')
-  conflicts=('libwebkit3')
-  provides=("libwebkit3=${pkgver}")
-  replaces=('libwebkit3')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk3"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_webkitgtk2() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gst-plugins-base-libs')
-  conflicts=('libwebkit')
-  provides=("libwebkit=${pkgver}")
-  replaces=('libwebkit')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/wireless_tools/PKGBUILD b/testing/wireless_tools/PKGBUILD
deleted file mode 100644
index 3ec9cd7d1..000000000
--- a/testing/wireless_tools/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 165481 2012-08-20 14:54:59Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jason Chu <jchu@xentac.net>
-
-pkgname=wireless_tools
-pkgver=29
-pkgrel=7
-pkgdesc='Tools allowing to manipulate the Wireless Extensions'
-url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
-license=('GPL')
-arch=('i686' 'x86_64')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz"
-        'dense.patch')
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
-          '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
-
-build() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
-	patch -p1 -i ../dense.patch # FS#15363
-	make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
-	make \
-		INSTALL_DIR="${pkgdir}/usr/sbin" \
-		INSTALL_LIB="${pkgdir}/usr/lib" \
-		INSTALL_INC="${pkgdir}/usr/include" \
-		INSTALL_MAN="${pkgdir}/usr/share/man" \
-		install
-}
diff --git a/testing/wireless_tools/dense.patch b/testing/wireless_tools/dense.patch
deleted file mode 100644
index 85182cd82..000000000
--- a/testing/wireless_tools/dense.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-The length field of wext data (iw_point.data) is 16 bits. The largest
-value is thus 65535. During the attempts to increase buffer size the
-buffer starts at 4096 and is doubled after each failure to fill. From the
-time this length reaches 65536 it is effectively zero. We thus loose all
-potential space from 32768 to 65535.
-
-This problem is clear when scanning in a RF dense environment.
-
-Without this patch:
-~$ iwlist wlan0 scan
-print_scanning_info: Allocation failed
-
-With this patch:
-~$ iwlist wlan0 scan | grep Cell | wc -l
-86
-
-Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-
----
-A similar patch was recently created to fix wpa_supplicant.
-
-I could not find a source code repo for this code and created this patch
-against version 30-pre7 downloaded from 
-http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-
-diff -uprN wireless_tools_org/wireless_tools.30/iwlist.c wireless_tools.30/iwlist.c
---- wireless_tools_org/wireless_tools.30/iwlist.c	2008-01-16 17:45:41.000000000 -0800
-+++ wireless_tools.30/iwlist.c	2009-02-12 14:16:48.000000000 -0800
-@@ -800,7 +800,7 @@ print_scanning_info(int		skfd,
- 	  if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
- 	    {
- 	      /* Check if buffer was too small (WE-17 only) */
--	      if((errno == E2BIG) && (range.we_version_compiled > 16))
-+	      if((errno == E2BIG) && (range.we_version_compiled > 16) && (buflen < 65535))
- 		{
- 		  /* Some driver may return very large scan results, either
- 		   * because there are many cells, or because they have many
-@@ -816,6 +816,10 @@ print_scanning_info(int		skfd,
- 		  else
- 		    buflen *= 2;
- 
-+		  /* wrq.u.data.length is 16 bits so max size is 65535 */
-+		  if(buflen > 65535)
-+		    buflen = 65535;
-+
- 		  /* Try again */
- 		  goto realloc;
- 		}
-
diff --git a/testing/wpa_actiond/PKGBUILD b/testing/wpa_actiond/PKGBUILD
deleted file mode 100644
index 3e3642442..000000000
--- a/testing/wpa_actiond/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 163526 2012-07-14 13:40:29Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=wpa_actiond
-pkgver=1.3
-pkgrel=1
-pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
-arch=('i686' 'x86_64')
-url="http://projects.archlinux.org/wpa_actiond.git/"
-license=('GPL')
-depends=('glibc' 'wpa_supplicant')
-source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4523b76980198666ac93f3a3772a10554ef608e6a18ab9eb1346303ee3a6f4b1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond"
-}
-# vim:set ts=2 sw=2 et:
diff --git a/testing/wpa_supplicant/PKGBUILD b/testing/wpa_supplicant/PKGBUILD
deleted file mode 100644
index 5cc420cbf..000000000
--- a/testing/wpa_supplicant/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 168658 2012-10-13 20:56:07Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=wpa_supplicant
-pkgver=1.0
-pkgrel=2
-pkgdesc="A utility providing key negotiation for WPA wireless networks"
-url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
-depends=('openssl' 'dbus-core' 'readline' 'libnl')
-optdepends=('wpa_supplicant_gui: wpa_gui program')
-license=('GPL')
-backup=('etc/wpa_supplicant/wpa_supplicant.conf')
-source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz"
-	config hostap_allow-linking-with-libnl-3.2.patch)
-md5sums=('8650f6aa23646ef634402552d0669640'
-         'c035e45e8e240239eecd7402f235fb3b'
-         '473fb6b77909ec5a50b6f4d91370e86b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/"
-
-  # from fedora
-  patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
-  cd "${pkgname}"
-
-  cp "${srcdir}/config" ./.config
-
-  sed -i 's@/usr/local@$(PREFIX)@g' Makefile
-
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/etc/wpa_supplicant"
-  install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/wpa_supplicant.conf"
-
-  install -d -m755 "${pkgdir}/usr/share/man/man"{5,8}
-  install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/"
-  install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/"
-  rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8
-
-  install -d -m755 "${pkgdir}/usr/share/dbus-1/system-services"
-  install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/"
-
-  install -d -m755 "${pkgdir}/etc/dbus-1/system.d"
-  install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf"
-
-  install -d -m755 "${pkgdir}/usr/lib/systemd/system"
-  install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/"
-}
diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config
deleted file mode 100644
index 5e6dfedc8..000000000
--- a/testing/wpa_supplicant/config
+++ /dev/null
@@ -1,482 +0,0 @@
-# Example wpa_supplicant build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cases, these lines should use += in order not
-# to override previous values of the variables.
-
-
-# Uncomment following two lines and fix the paths if you have installed OpenSSL
-# or GnuTLS in non-default location
-#CFLAGS += -I/usr/local/openssl/include
-#LIBS += -L/usr/local/openssl/lib
-
-# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
-# the kerberos files are not in the default include path. Following line can be
-# used to fix build issues on such systems (krb5.h not found).
-#CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-#	-I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for old Broadcom driver
-# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
-# Linux wireless extensions and does not need (or even work) with the old
-# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
-#CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100/2200 driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_IPW=y
-
-# Driver interface for Ralink driver
-#CONFIG_DRIVER_RALINK=y
-
-# Driver interface for generic Linux wireless extensions
-# Note: WEXT is deprecated in the current Linux kernel version and no new
-# functionality is added to it. nl80211-based interface is the new
-# replacement for WEXT and its use allows wpa_supplicant to properly control
-# the driver to improve existing functionality like roaming and to support new
-# functionality.
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-#LIBS_p += -L/usr/local/lib
-#LIBS_c += -L/usr/local/lib
-
-# Driver interface for Windows NDIS
-#CONFIG_DRIVER_NDIS=y
-#CFLAGS += -I/usr/include/w32api/ddk
-#LIBS += -L/usr/local/lib
-# For native build using mingw
-#CONFIG_NATIVE_WINDOWS=y
-# Additional directories for cross-compilation on Linux host for mingw target
-#CFLAGS += -I/opt/mingw/mingw32/include/ddk
-#LIBS += -L/opt/mingw/mingw32/lib
-#CC=mingw32-gcc
-# By default, driver_ndis uses WinPcap for low-level operations. This can be
-# replaced with the following option which replaces WinPcap calls with NDISUIO.
-# However, this requires that WZC is disabled (net stop wzcsvc) before starting
-# wpa_supplicant.
-# CONFIG_USE_NDISUIO=y
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Driver interface for wired Ethernet drivers
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for the Broadcom RoboSwitch family
-#CONFIG_DRIVER_ROBOSWITCH=y
-
-# Driver interface for no driver (e.g., WPS ER only)
-#CONFIG_DRIVER_NONE=y
-
-# Solaris libraries
-#LIBS += -lsocket -ldlpi -lnsl
-#LIBS_c += -lsocket
-
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
-CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5
-CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
-CONFIG_EAP_TLS=y
-
-# EAL-PEAP
-CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
-CONFIG_EAP_TTLS=y
-
-# EAP-FAST
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
-# to add the needed functions.
-#CONFIG_EAP_FAST=y
-
-# EAP-GTC
-CONFIG_EAP_GTC=y
-
-# EAP-OTP
-CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-pwd (secure authentication using only a password)
-#CONFIG_EAP_PWD=y
-
-# EAP-PAX
-#CONFIG_EAP_PAX=y
-
-# LEAP
-CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
-# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
-
-# Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
-
-# EAP-SAKE
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# EAP-TNC and related Trusted Network Connect support (experimental)
-#CONFIG_EAP_TNC=y
-
-# Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
-# Enable WSC 2.0 support
-#CONFIG_WPS2=y
-# Enable WPS external registrar functionality
-#CONFIG_WPS_ER=y
-# Disable credentials for an open network by default when acting as a WPS
-# registrar.
-#CONFIG_WPS_REG_DISABLE_OPEN=y
-
-# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
-# engine.
-CONFIG_SMARTCARD=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Development testing
-#CONFIG_EAPOL_TEST=y
-
-# Select control interface backend for external programs, e.g, wpa_cli:
-# unix = UNIX domain sockets (default for Linux/*BSD)
-# udp = UDP sockets using localhost (127.0.0.1)
-# named_pipe = Windows Named Pipe (default for Windows)
-# y = use default (backwards compatibility)
-# If this option is commented out, control interface is not included in the
-# build.
-CONFIG_CTRL_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-CONFIG_READLINE=y
-
-# Include internal line edit mode in wpa_cli. This can be used as a replacement
-# for GNU Readline to provide limited command line editing and history support.
-#CONFIG_WPA_CLI_EDIT=y
-
-# Remove debugging code that is printing out debug message to stdout.
-# This can be used to reduce the size of the wpa_supplicant considerably
-# if debugging code is not needed. The size reduction can be around 35%
-# (e.g., 90 kB).
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
-# 35-50 kB in code size.
-#CONFIG_NO_WPA=y
-
-# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
-# save about 1 kB in code size when building only WPA-Personal (no EAP support)
-# or 6 kB if building for WPA-Enterprise.
-#CONFIG_NO_WPA2=y
-
-# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
-# This option can be used to reduce code size by removing support for
-# converting ASCII passphrases into PSK. If this functionality is removed, the
-# PSK can only be configured as the 64-octet hexstring (e.g., from
-# wpa_passphrase). This saves about 0.5 kB in code size.
-#CONFIG_NO_WPA_PASSPHRASE=y
-
-# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
-# This can be used if ap_scan=1 mode is never enabled.
-#CONFIG_NO_SCAN_PROCESSING=y
-
-# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
-#	path is given on command line, not here; this option is just used to
-#	select the backend that allows configuration files to be used)
-# winreg = Windows registry (see win_example.reg for an example)
-CONFIG_BACKEND=file
-
-# Remove configuration write functionality (i.e., to allow the configuration
-# file to be updated based on runtime configuration changes). The runtime
-# configuration can still be changed, the changes are just not going to be
-# persistent over restarts. This option can be used to reduce code size by
-# about 3.5 kB.
-#CONFIG_NO_CONFIG_WRITE=y
-
-# Remove support for configuration blobs to reduce code size by about 1.5 kB.
-#CONFIG_NO_CONFIG_BLOBS=y
-
-# Select program entry point implementation:
-# main = UNIX/POSIX like main() function (default)
-# main_winsvc = Windows service (read parameters from registry)
-# main_none = Very basic example (development use only)
-#CONFIG_MAIN=main
-
-# Select wrapper for operatins system and C library specific functions
-# unix = UNIX/POSIX like systems (default)
-# win32 = Windows systems
-# none = Empty template
-#CONFIG_OS=unix
-
-# Select event loop implementation
-# eloop = select() loop (default)
-# eloop_win = Windows events and WaitForMultipleObject() loop
-# eloop_none = Empty template
-#CONFIG_ELOOP=eloop
-
-# Select layer 2 packet implementation
-# linux = Linux packet socket (default)
-# pcap = libpcap/libdnet/WinPcap
-# freebsd = FreeBSD libpcap
-# winpcap = WinPcap with receive thread
-# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
-# none = Empty template
-#CONFIG_L2_PACKET=linux
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-
-# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
-# can be enabled to get a stronger construction of messages when block ciphers
-# are used. It should be noted that some existing TLS v1.0 -based
-# implementation may not be compatible with TLS v1.1 message (ClientHello is
-# sent prior to negotiating which version will be used)
-#CONFIG_TLSV11=y
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
-#CONFIG_INTERNAL_LIBTOMMATH=y
-#ifndef CONFIG_INTERNAL_LIBTOMMATH
-#LTM_PATH=/usr/src/libtommath-0.39
-#CFLAGS += -I$(LTM_PATH)
-#LIBS += -L$(LTM_PATH)
-#LIBS_p += -L$(LTM_PATH)
-#endif
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
-
-# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
-# This is only for Windows builds and requires WMI-related header files and
-# WbemUuid.Lib from Platform SDK even when building with MinGW.
-#CONFIG_NDIS_EVENTS_INTEGRATED=y
-#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
-
-# Add support for old DBus control interface
-# (fi.epitest.hostap.WPASupplicant)
-CONFIG_CTRL_IFACE_DBUS=y
-
-# Add support for new DBus control interface
-# (fi.w1.hostap.wpa_supplicant1)
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-
-# Add introspection support for new DBus control interface
-CONFIG_CTRL_IFACE_DBUS_INTRO=y
-
-# Add support for loading EAP methods dynamically as shared libraries.
-# When this option is enabled, each EAP method can be either included
-# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
-# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
-# be loaded in the beginning of the wpa_supplicant configuration file
-# (see load_dynamic_eap parameter in the example file) before being used in
-# the network blocks.
-#
-# Note that some shared parts of EAP methods are included in the main program
-# and in order to be able to use dynamic EAP methods using these parts, the
-# main program must have been build with the EAP method enabled (=y or =dyn).
-# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
-# unless at least one of them was included in the main build to force inclusion
-# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
-# in the main build to be able to load these methods dynamically.
-#
-# Please also note that using dynamic libraries will increase the total binary
-# size. Thus, it may not be the best option for targets that have limited
-# amount of memory/flash.
-#CONFIG_DYNAMIC_EAP_METHODS=y
-
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
-
-# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
-CONFIG_DEBUG_FILE=y
-
-# Send debug messages to syslog instead of stdout
-#CONFIG_DEBUG_SYSLOG=y
-# Set syslog facility for debug messages
-#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
-
-# Enable privilege separation (see README 'Privilege separation' for details)
-#CONFIG_PRIVSEP=y
-
-# Enable mitigation against certain attacks against TKIP by delaying Michael
-# MIC error reports by a random amount of time between 0 and 60 seconds
-#CONFIG_DELAYED_MIC_ERROR_REPORT=y
-
-# Enable tracing code for developer debugging
-# This tracks use of memory allocations and other registrations and reports
-# incorrect use with a backtrace of call (or allocation) location.
-#CONFIG_WPA_TRACE=y
-# For BSD, uncomment these.
-#LIBS += -lexecinfo
-#LIBS_p += -lexecinfo
-#LIBS_c += -lexecinfo
-
-# Use libbfd to get more details for developer debugging
-# This enables use of libbfd to get more detailed symbols for the backtraces
-# generated by CONFIG_WPA_TRACE=y.
-#CONFIG_WPA_TRACE_BFD=y
-# For BSD, uncomment these.
-#LIBS += -lbfd -liberty -lz
-#LIBS_p += -lbfd -liberty -lz
-#LIBS_c += -lbfd -liberty -lz
-
-# wpa_supplicant depends on strong random number generation being available
-# from the operating system. os_get_random() function is used to fetch random
-# data when needed, e.g., for key generation. On Linux and BSD systems, this
-# works by reading /dev/urandom. It should be noted that the OS entropy pool
-# needs to be properly initialized before wpa_supplicant is started. This is
-# important especially on embedded devices that do not have a hardware random
-# number generator and may by default start up with minimal entropy available
-# for random number generation.
-#
-# As a safety net, wpa_supplicant is by default trying to internally collect
-# additional entropy for generating random data to mix in with the data fetched
-# from the OS. This by itself is not considered to be very strong, but it may
-# help in cases where the system pool is not initialized properly. However, it
-# is very strongly recommended that the system pool is initialized with enough
-# entropy either by using hardware assisted random number generator or by
-# storing state over device reboots.
-#
-# wpa_supplicant can be configured to maintain its own entropy store over
-# restarts to enhance random number generation. This is not perfect, but it is
-# much more secure than using the same sequence of random numbers after every
-# reboot. This can be enabled with -e<entropy file> command line option. The
-# specified file needs to be readable and writable by wpa_supplicant.
-#
-# If the os_get_random() is known to provide strong random data (e.g., on
-# Linux/BSD, the board in question is known to have reliable source of random
-# data from /dev/urandom), the internal wpa_supplicant random pool can be
-# disabled. This will save some in binary size and CPU use. However, this
-# should only be considered for builds that are known to be used on devices
-# that meet the requirements described above.
-CONFIG_NO_RANDOM_POOL=y
-
-# IEEE 802.11n (High Throughput) support (mainly for AP mode)
-#CONFIG_IEEE80211N=y
-
-# Interworking (IEEE 802.11u)
-# This can be used to enable functionality to improve interworking with
-# external networks (GAS/ANQP to learn more about the networks and network
-# selection based on available credentials).
-#CONFIG_INTERWORKING=y
-
-CONFIG_LIBNL32=y
-
-# More options that are not in defconfig:
-
-# Lightweight AP mode
-CONFIG_AP=y
-
-# P2P (WiFi Direct)
-CONFIG_P2P=y
-
-# RSN IBSS/AdHoc support
-CONFIG_IBSS_RSN=y
-
-# Simple background scan
-CONFIG_BGSCAN_SIMPLE=y
diff --git a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
deleted file mode 100644
index 5d8903906..000000000
--- a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak
---- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo	2012-03-02 16:11:43.176448714 -0600
-+++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak	2012-03-02 16:12:29.759866341 -0600
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
- else
-   ifdef CONFIG_LIBNL_TINY
-     DRV_LIBS += -lnl-tiny
diff --git a/testing/wpa_supplicant_gui/PKGBUILD b/testing/wpa_supplicant_gui/PKGBUILD
deleted file mode 100644
index e8ad8125a..000000000
--- a/testing/wpa_supplicant_gui/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 162332 2012-06-25 10:11:07Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=wpa_supplicant_gui
-pkgver=1.0
-pkgrel=1
-pkgdesc="A Qt frontend to wpa_supplicant"
-url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
-depends=('qt' "wpa_supplicant=$pkgver")
-license=('GPL')
-source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz"
-        compile-fix.patch)
-sha256sums=('91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c'
-            '044be1032faf93c5f0abf22d7ae77dc0d1d1fef0c2c30646d54950b86601709f')
-
-build() {
-  cd wpa_supplicant-${pkgver}
-  patch -p1 <../compile-fix.patch
-  cd wpa_supplicant/wpa_gui-qt4
-  qmake
-  make
-}
-
-package() {
-  cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4"
-  install -Dm755 wpa_gui "${pkgdir}/usr/sbin/wpa_gui"
-  install -Dm644 icons/wpa_gui.svg "${pkgdir}/usr/share/pixmaps/wpa_gui.svg"
-  install -Dm644 wpa_gui.desktop "${pkgdir}/usr/share/applications/wpa_gui.desktop"
-  install -Dm644 "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8" \
-     "${pkgdir}/usr/share/man/man8/wpa_gui.8"
-}
diff --git a/testing/wpa_supplicant_gui/compile-fix.patch b/testing/wpa_supplicant_gui/compile-fix.patch
deleted file mode 100644
index 3303b3699..000000000
--- a/testing/wpa_supplicant_gui/compile-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
---- wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-05-09 23:56:09.000000000 +0200
-+++ wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-06-25 12:06:46.045261398 +0200
-@@ -12,10 +12,8 @@
-  * See README and COPYING for more details.
-  */
- 
--#ifdef __MINGW32__
- /* Need to get getopt() */
- #include <unistd.h>
--#endif
- 
- #ifdef CONFIG_NATIVE_WINDOWS
- #include <windows.h>
diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD
deleted file mode 100644
index 7fb20c2ac..000000000
--- a/testing/x264/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 163081 2012-07-06 16:26:37Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=x264
-pkgver=20120705
-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-stable.tar.bz2)
-md5sums=('81e5bec5d5774a4a3f567f14bd94289c')
-
-build() {
-    cd "$pkgname-snapshot-$pkgver-2245-stable"
-
-    ./configure --enable-shared
-
-    make
-}
-package() {
-    cd "$pkgname-snapshot-$pkgver-2245-stable"
-
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xcompmgr/PKGBUILD b/testing/xcompmgr/PKGBUILD
deleted file mode 100644
index f9439333a..000000000
--- a/testing/xcompmgr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 165902 2012-09-03 10:37:05Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Leslie P. Polzer <leslie.polzer@gmx.net>
-
-pkgname=xcompmgr
-pkgver=1.1.6
-pkgrel=2
-pkgdesc="Composite Window-effects manager for X.org"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libxcomposite' 'libxdamage' 'libxrender' 'libxext')
-conflicts=('xapps')
-replaces=('xapps')
-source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2
-       fix_broken_shadows.diff)
-sha1sums=('a9cf78ea32bac51ff584115381f195566b164fe3'
-          '435f9f0ad652bdd759f822514bf1559abf119ffe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix broken shadows in openbox - patch takern from https://bugs.freedesktop.org/show_bug.cgi?id=46285
-  patch -Np0 -i ${srcdir}/fix_broken_shadows.diff
-  ./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/xcompmgr/fix_broken_shadows.diff b/testing/xcompmgr/fix_broken_shadows.diff
deleted file mode 100644
index 39b8ac725..000000000
--- a/testing/xcompmgr/fix_broken_shadows.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- xcompmgr.c	2011-11-19 01:49:52.000000000 -0600
-+++ xcompmgr.c	2012-08-11 21:58:58.000000000 -0500
-@@ -1028,7 +1028,6 @@
- 	{
- 	    w->borderClip = XFixesCreateRegion (dpy, NULL, 0);
- 	    XFixesCopyRegion (dpy, w->borderClip, region);
--	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
- 	}
- 	w->prev_trans = t;
- 	t = w;
-@@ -1080,6 +1079,8 @@
- 	if (w->mode == WINDOW_TRANS)
- 	{
- 	    int	x, y, wid, hei;
-+	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
-+	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
- #if HAS_NAME_WINDOW_PIXMAP
- 	    x = w->a.x;
- 	    y = w->a.y;
-@@ -1099,6 +1100,8 @@
- 	else if (w->mode == WINDOW_ARGB)
- 	{
- 	    int	x, y, wid, hei;
-+	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
-+	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
- #if HAS_NAME_WINDOW_PIXMAP
- 	    x = w->a.x;
- 	    y = w->a.y;
diff --git a/testing/xf86-input-acecad/PKGBUILD b/testing/xf86-input-acecad/PKGBUILD
deleted file mode 100644
index d711418ad..000000000
--- a/testing/xf86-input-acecad/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168205 2012-10-06 20:05:59Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-acecad
-pkgver=1.5.0
-pkgrel=5
-pkgdesc="X.Org acecad tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('sysfsutils')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        assign-local-private-after-allocating.patch)
-sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
-          '9301020b0ef3c6f2081e957481a88d2e187a7973')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/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 c0914a3c8..000000000
--- a/testing/xf86-input-aiptek/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168206 2012-10-06 20:06:02Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-aiptek
-pkgver=1.4.1
-pkgrel=5
-pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-elographics/PKGBUILD b/testing/xf86-input-elographics/PKGBUILD
deleted file mode 100644
index ee6ad8451..000000000
--- a/testing/xf86-input-elographics/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 88566 2010-08-24 08:47:16Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-elographics
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="X.org Elographics TouchScreen input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-evdev/PKGBUILD b/testing/xf86-input-evdev/PKGBUILD
deleted file mode 100644
index 18a8c1d00..000000000
--- a/testing/xf86-input-evdev/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168208 2012-10-06 20:06:09Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <Alexander@archlinux.org
-
-pkgname=xf86-input-evdev
-pkgver=2.7.3
-pkgrel=2
-pkgdesc="X.org evdev input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'systemd-tools' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool' '!makeflags')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/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 c6413f2b6..000000000
--- a/testing/xf86-input-joystick/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 168209 2012-10-06 20:06:17Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-joystick
-pkgver=1.6.1
-pkgrel=2
-pkgdesc="X.Org Joystick input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        #git-fixes.patch
-        50-joystick.conf)
-sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580'
-          'e1ff3699a0470c6bb78a53f718df9d8521621e11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-joystick/git-fixes.patch b/testing/xf86-input-joystick/git-fixes.patch
deleted file mode 100644
index b3afa06cc..000000000
--- a/testing/xf86-input-joystick/git-fixes.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
-From: Terry Lambert <tlambert@chromium.org>
-Date: Sat, 16 Jul 2011 00:23:22 +0000
-Subject: Return proper default for unknown values in pInfo->device_control.
-
-Signed-off-by: Terry Lambert <tlambert@chromium.org>
-Reviewed-by: Stephane Marchesin <marcheu@chromium.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/jstk.c b/src/jstk.c
-index ec6b79a..6db0e7c 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
- 
-     default:
-         ErrorF("unsupported mode=%d\n", what);
--        return !Success;
--        break;
-+        return BadValue;
-     } /* switch (what) */
-     return Success;
- }
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index 3c471ce..d699dcd 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
-         DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n"));
-         dev->public.on = FALSE;
-         break;
-+    default:
-+        return BadValue;
-     }
- 
-     return Success;
---
-cgit v0.9.0.2-2-gbebe
-From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
-From: Devin J. Pohly <djpohly+xorg@gmail.com>
-Date: Sat, 03 Sep 2011 23:00:07 +0000
-Subject: unify capitalization of joystick properties
-
-the axis keys high/low properties were inconsistently capitalized,
-leading to potential confusion as to why one works but not the other.
-
-Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/include/joystick-properties.h b/include/joystick-properties.h
-index 49ef800..36f4082 100644
---- a/include/joystick-properties.h
-+++ b/include/joystick-properties.h
-@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING {
- 
- /** Scancodes for axis in high position */
- /* 8 bit, 4 per axis */
--#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)"
-+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)"
- 
- /** Set the mapping of each button to
-     none, x, y, zx, zy, button, key, speed_multiply,
---
-cgit v0.9.0.2-2-gbebe
-From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sat, 15 Oct 2011 22:47:52 +0000
-Subject: label buttons and axes
-
-Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping.
-Mapping can be changed while running so the labels will be constant.
-
-Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator
-data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X"
-and "Rel Y", representing the aggregated post-calculation data from all axes.
-
-Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
----
-diff --git a/man/joystick.man b/man/joystick.man
-index da92ceb..b401de5 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -140,7 +140,11 @@ Neither
- .B mode
- nor
- .B axis
--needs to be set to generate extra valuator events.
-+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with 
-+.I 1
-+, i.e.
-+.I \*qAxis 1\*q
-+for the first axis (being the 3rd valuator).
- Default: not set.
- .TP 7
- .BI "\*qaxis="[<factor>]<axis> \*q
-@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys
- The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis.
- The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings.
- 
-+.SH "XI2 Events"
-+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons:
-+
-+.nf
-+.BI "  Option  \*qMapAxis1\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis2\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis3\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis4\*q      \*q" "mode=none valuator" \*q
-+\ \ ...
-+.BI "  Option  \*qMapButton1\*q      \*q" "button=1" \*q
-+.BI "  Option  \*qMapButton2\*q      \*q" "button=2" \*q
-+.BI "  Option  \*qMapButton3\*q      \*q" "button=3" \*q
-+.BI "  Option  \*qMapButton4\*q      \*q" "button=4" \*q
-+.BI "  Option  \*qMapButton5\*q      \*q" "button=5" \*q
-+\ \ ...
-+.fi
-+
-+You might also want to set the device "floating" to stop it from reporting core events:
-+.nf
-+.BI "  Option  \*qFloating\*q      \*q" "true" \*q
-+.fi
-+
- .SH "NOTES"
- Configuration through
- .I InputClass
-diff --git a/src/jstk.c b/src/jstk.c
-index 6db0e7c..772683f 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-  * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>       
-  *                                                                            
-  * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -21,7 +21,6 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-     switch (what) {
-     case DEVICE_INIT: {
-         int m;
-+        char str[32];
-         CARD8 buttonmap[BUTTONMAP_SIZE+1];
-         DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n"));
-         /* Probe device and return if error */
-@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-         }
- 
-         for (m=0; m<=BUTTONMAP_SIZE; m++) {
-+            sprintf(str, "Button %d", m);
-+
-             buttonmap[m] = m;
--	}
-+            btn_labels[m] = MakeAtom(str, strlen(str), TRUE);
-+        }
-+
-+
- 
--            
--            
-         if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, 
-             btn_labels,
-             buttonmap) == FALSE) {
-@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-             if (priv->axis[i].valuator != -1)
-         {
-             DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m));
-+            sprintf(str, "Axis %d", i + 1);
-             priv->axis[i].valuator = m++;
-+            axes_labels[i] = MakeAtom(str, strlen(str), TRUE);
-         }
- 
-         if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
-@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec =
-                    /* a tool */
- };
- 
--
- /*
-  ***************************************************************************
-  *
-@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = {
-     jstkDriverPlug,
-     jstkDriverUnplug
- };
-+
-+/* vim: set filetype=c.doxygen ts=4 et: */
-+
---
-cgit v0.9.0.2-2-gbebe
-From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:27:22 +0000
-Subject: Fix option type for option duplication
-
-xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption
-list.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index d699dcd..e842941 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *options;
-     InputOption *iopts = NULL, *tmp;
-     DeviceIntPtr dev;
-+    XF86OptionPtr opts;
- 
-     /* duplicate option list, append to name */
--    options = xf86OptionListDuplicate(pInfo->options);
-+    opts = xf86OptionListDuplicate(pInfo->options);
-     strcpy(name, pInfo->name);
-     strcat(name, " (keys)");
--    options = xf86ReplaceStrOption(options, "Name", name);
--    options = xf86ReplaceStrOption(options, "_source", "_driver/joystick");
-+    opts = xf86ReplaceStrOption(opts, "Name", name);
-+    opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
- 
--    while(options)
-+    while(opts)
-     {
-         tmp = calloc(1, sizeof(InputOption));
- 
--        tmp->key = xf86OptionName(options);
--        tmp->value = xf86OptionValue(options);
-+        tmp->key = xf86OptionName(opts);
-+        tmp->value = xf86OptionValue(opts);
-         tmp->next = iopts;
-         iopts = tmp;
--        options = xf86NextOption(options);
-+        opts = xf86NextOption(opts);
-     }
- 
-     /* duplicate attribute list */
---
-cgit v0.9.0.2-2-gbebe
-From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:33:08 +0000
-Subject: Deal with opaque input option types.
-
-ABI 14 made the InputOption type opaque, move the existing code to ifdefs
-and use the new function calls otherwise.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index e842941..a71275a 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-     return Success;
- }
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
-+static InputOption*
-+input_option_new(InputOption* list, char *key, char *value)
-+{
-+    InputOption *tmp;
-+
-+    tmp = calloc(1, sizeof(*tmp));
-+    tmp->key = key;
-+    tmp->value = value;
-+    tmp->next = list;
-+
-+    return tmp;
-+}
-+
-+static void
-+input_option_free_list(InputOption **list)
-+{
-+    InputOption *iopts = *list;
-+
-+    while(iopts)
-+    {
-+        InputOption *tmp = iopts->next;
-+        free(iopts->key);
-+        free(iopts->value);
-+        free(iopts);
-+        iopts = tmp;
-+    }
-+
-+    *list = NULL;
-+}
-+
-+#endif
-+
- InputInfoPtr
- jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- {
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *iopts = NULL, *tmp;
-+    InputOption *iopts = NULL;
-     DeviceIntPtr dev;
-     XF86OptionPtr opts;
- 
-@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     while(opts)
-     {
--        tmp = calloc(1, sizeof(InputOption));
--
--        tmp->key = xf86OptionName(opts);
--        tmp->value = xf86OptionValue(opts);
--        tmp->next = iopts;
--        iopts = tmp;
-+        iopts = input_option_new(iopts,
-+                                 xf86OptionName(opts),
-+                                 xf86OptionValue(opts));
-         opts = xf86NextOption(opts);
-     }
- 
-@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     rc = NewInputDeviceRequest(iopts, attrs, &dev);
- 
--    while(iopts)
--    {
--        tmp = iopts->next;
--        free(iopts->key);
--        free(iopts->value);
--        free(iopts);
--        iopts = tmp;
--    }
-+    input_option_free_list(&iopts);
- 
-     FreeInputAttributes(attrs);
- 
---
-cgit v0.9.0.2-2-gbebe
-From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 17:04:25 +0000
-Subject: man: valuators are not added automatically
-
----
-diff --git a/man/joystick.man b/man/joystick.man
-index b401de5..9f38ceb 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -129,9 +129,6 @@ can be one of:
- 
- .B none, relative, accelerated, absolute
- 
--Every axis which's mode is not
--.B none
--will be reported as an additional valuator.
- .TP 7
- .B \*qvaluator\*q
- Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always 
---
-cgit v0.9.0.2-2-gbebe
-From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 19:36:07 +0000
-Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device
-
-udev does copy the Driver line to the list of options, but when manually
-specifying the driver in xorg.conf, the option "Driver" is unset. Because we
-do hotplug a sub-device from within the core device, we need the "Driver"
-option to be present in the list.
-
-This should fix archlinux bug #23577:
-  https://bugs.archlinux.org/task/23577
-
-Thanks to Malek for coming up with a fix.
-
-Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index a71275a..241b15d 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     strcat(name, " (keys)");
-     opts = xf86ReplaceStrOption(opts, "Name", name);
-     opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
-+    opts = xf86AddNewOption(opts, "Driver", pInfo->driver);
- 
-     while(opts)
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-input-keyboard/PKGBUILD b/testing/xf86-input-keyboard/PKGBUILD
deleted file mode 100644
index a338e294a..000000000
--- a/testing/xf86-input-keyboard/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168210 2012-10-06 20:06:20Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-keyboard
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="X.Org keyboard input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-mouse/PKGBUILD b/testing/xf86-input-mouse/PKGBUILD
deleted file mode 100644
index c33333e24..000000000
--- a/testing/xf86-input-mouse/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168211 2012-10-06 20:06:24Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-mouse
-pkgver=1.8.1
-pkgrel=2
-pkgdesc="X.org mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/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 795ba9666..000000000
--- a/testing/xf86-input-synaptics/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168212 2012-10-06 20:06:30Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski  <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-input-synaptics
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        10-synaptics.conf)
-sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
-            'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  rm -rf "${pkgdir}/usr/share/X11"
-}
diff --git a/testing/xf86-input-vmmouse/PKGBUILD b/testing/xf86-input-vmmouse/PKGBUILD
deleted file mode 100644
index 846628429..000000000
--- a/testing/xf86-input-vmmouse/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168213 2012-10-06 20:06:33Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-vmmouse
-pkgver=12.9.0
-pkgrel=2
-pkgdesc="X.org VMWare Mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc' 'sh')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('83500beddba2da390389705d482131872fe9be8b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-xorg-conf-dir=/etc/X11/xorg.conf.d \
-    --with-udev-rules-dir=/usr/lib/udev/rules.d
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-  rm -rfv ${pkgdir}/usr/{lib,share}/hal
-}
diff --git a/testing/xf86-input-void/PKGBUILD b/testing/xf86-input-void/PKGBUILD
deleted file mode 100644
index c41307cc6..000000000
--- a/testing/xf86-input-void/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168214 2012-10-06 20:06:37Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-void
-pkgver=1.4.0
-pkgrel=4
-pkgdesc="X.org void input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/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 8bc2188ff..000000000
--- a/testing/xf86-input-wacom/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168215 2012-10-06 20:06:42Z andyrtr $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: M Rawash <mrawash@gmail.com>
-
-pkgname=xf86-input-wacom
-pkgver=0.17.0
-pkgrel=2
-pkgdesc="X.Org Wacom tablet driver"
-arch=('i686' 'x86_64')
-url="http://linuxwacom.sourceforge.net/"
-license=('GPL')
-backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr' 'libxinerama')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
-        70-wacom.rules)
-md5sums=('92dffefc3bc30523463f2fa4bc753448'
-         '10db4f8272286690255c1bcc18bfdd92')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules"
-}
diff --git a/testing/xf86-video-apm/PKGBUILD b/testing/xf86-video-apm/PKGBUILD
deleted file mode 100644
index f9ae39c07..000000000
--- a/testing/xf86-video-apm/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168216 2012-10-06 20:06:45Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="X.org Alliance ProMotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ark/PKGBUILD b/testing/xf86-video-ark/PKGBUILD
deleted file mode 100644
index 3d2bb12ae..000000000
--- a/testing/xf86-video-ark/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168217 2012-10-06 20:06:48Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ark
-pkgver=0.7.5
-pkgrel=2
-pkgdesc="X.org ark video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ast/PKGBUILD b/testing/xf86-video-ast/PKGBUILD
deleted file mode 100644
index 02f67d096..000000000
--- a/testing/xf86-video-ast/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168218 2012-10-06 20:06:51Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ast
-pkgver=0.97.0
-pkgrel=2
-pkgdesc="X.org ASPEED AST Graphics video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD
deleted file mode 100644
index affb5d2ad..000000000
--- a/testing/xf86-video-ati/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 168219 2012-10-06 20:06:54Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-ati
-pkgver=6.14.6
-epoch=1
-pkgrel=2
-pkgdesc="X.org ati video driver"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libdrm>=2.4.37' 'systemd-tools' 'ati-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # fix build now that XAA isn't available in new Xorg - http://bugs.gentoo.org/show_bug.cgi?id=428094
-  sed -i '/USE_XAA, 1/d' configure.ac
-  autoreconf -vfi
-  
-  ./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-video-chips/PKGBUILD b/testing/xf86-video-chips/PKGBUILD
deleted file mode 100644
index 83484ee3b..000000000
--- a/testing/xf86-video-chips/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168220 2012-10-06 20:06:59Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-chips
-pkgver=1.2.5
-pkgrel=2
-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' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h)
-sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
-            'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  cp ${srcdir}/iopl.h util/
-  ./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-video-chips/iopl.h b/testing/xf86-video-chips/iopl.h
deleted file mode 100644
index e08207c7f..000000000
--- a/testing/xf86-video-chips/iopl.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifdef __NetBSD__
-#  include <sys/types.h>
-#  include <machine/pio.h>
-#  include <machine/sysarch.h>
-#else
-#  if defined(__linux__)
-/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
- * #    include <sys/io.h>
- */
-int iopl(int level);
-#  endif
-#  if defined(SVR4) && defined(i386)
-#    include <sys/types.h>
-#    ifdef NCR
-       /* broken NCR <sys/sysi86.h> */
-#      define __STDC
-#      include <sys/sysi86.h>
-#      undef __STDC
-#    else
-#      include <sys/sysi86.h>
-#    endif
-#    ifdef SVR4
-#      if !defined(sun)
-#        include <sys/seg.h>
-#      endif
-#    endif
-#    include <sys/v86.h>
-#    if defined(sun)
-#      include <sys/psw.h>
-#    endif
-#  endif
-#  include "AsmMacros.h"
-#endif /* NetBSD */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef __NetBSD__
-#  define SET_IOPL() i386_iopl(3)
-#  define RESET_IOPL() i386_iopl(0)
-#else
-#  if defined(SVR4) && defined(i386)
-#    ifndef SI86IOPL
-#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
-#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
-#    else
-#      define SET_IOPL() sysi86(SI86IOPL,3)
-#      define RESET_IOPL() sysi86(SI86IOPL,0)
-#    endif
-#  else
-#    ifdef linux
-#      define SET_IOPL() iopl(3)
-#      define RESET_IOPL() iopl(0)
-#    else
-#      define SET_IOPL() (void)0
-#      define RESET_IOPL() (void)0
-#    endif
-#  endif
-#endif
diff --git a/testing/xf86-video-cirrus/PKGBUILD b/testing/xf86-video-cirrus/PKGBUILD
deleted file mode 100644
index ecde3bb28..000000000
--- a/testing/xf86-video-cirrus/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168221 2012-10-06 20:07:03Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-cirrus
-pkgver=1.5.1
-pkgrel=2
-pkgdesc="X.org Cirrus Logic video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557')
-
-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-video-dummy/PKGBUILD b/testing/xf86-video-dummy/PKGBUILD
deleted file mode 100644
index 61bcfaf34..000000000
--- a/testing/xf86-video-dummy/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168222 2012-10-06 20:07:07Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-dummy
-pkgver=0.3.6
-pkgrel=2
-pkgdesc="X.org dummy video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798')
-
-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-video-fbdev/PKGBUILD b/testing/xf86-video-fbdev/PKGBUILD
deleted file mode 100644
index 4f601a475..000000000
--- a/testing/xf86-video-fbdev/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168223 2012-10-06 20:07:10Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-fbdev
-pkgver=0.4.3
-pkgrel=2
-pkgdesc="X.org framebuffer video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831')
-
-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-video-glint/PKGBUILD b/testing/xf86-video-glint/PKGBUILD
deleted file mode 100644
index ddd99e5cc..000000000
--- a/testing/xf86-video-glint/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168225 2012-10-06 20:07:19Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-glint
-pkgver=1.2.8
-pkgrel=2
-pkgdesc="X.org GLINT/Permedia video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221')
-
-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-video-i128/PKGBUILD b/testing/xf86-video-i128/PKGBUILD
deleted file mode 100644
index e2892cd12..000000000
--- a/testing/xf86-video-i128/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168226 2012-10-06 20:07:22Z andyrtr $
-# Maintainer:Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-i128
-pkgver=1.3.6
-pkgrel=2
-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' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
-
-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-video-i740/PKGBUILD b/testing/xf86-video-i740/PKGBUILD
deleted file mode 100644
index 51e666726..000000000
--- a/testing/xf86-video-i740/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168227 2012-10-06 20:07:25Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-i740
-pkgver=1.3.4
-pkgrel=2
-pkgdesc="X.org Intel i740 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78')
-
-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-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD
deleted file mode 100644
index f08d68628..000000000
--- a/testing/xf86-video-intel/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169414 2012-10-20 17:32:31Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.20.12
-pkgrel=1
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-install=$pkgname.install
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14'
-           'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c')
-
-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-intel/xf86-video-intel.install b/testing/xf86-video-intel/xf86-video-intel.install
deleted file mode 100644
index d523eb61a..000000000
--- a/testing/xf86-video-intel/xf86-video-intel.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-  echo ">>> This driver now allows to switch"
-  echo ">>> between sna/uxa acceleration methods."
-  echo ">>> Add to the device section in /etc/X11/xorg.conf"
-  echo ">>>   Option \"AccelMethod\" \"sna\""
-  echo ">>> use uxa method if you run into trouble with sna."
-}
-
diff --git a/testing/xf86-video-mach64/PKGBUILD b/testing/xf86-video-mach64/PKGBUILD
deleted file mode 100644
index a8b670ac7..000000000
--- a/testing/xf86-video-mach64/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168229 2012-10-06 20:07:36Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mach64
-pkgver=6.9.3
-pkgrel=2
-pkgdesc="X.org mach64 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' )
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('mach64-dri: DRI1 support from community repo')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
-sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218'
-            '27f6531101ac26debc9cb5faa63e16aaf5bdb9001ddb817ffad5e4f60fbc4dd3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-  ./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-video-mach64/git_fixes.diff b/testing/xf86-video-mach64/git_fixes.diff
deleted file mode 100644
index aad11772e..000000000
--- a/testing/xf86-video-mach64/git_fixes.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Wed, 18 Jul 2012 08:46:49 +0000
-Subject: mach64: fix build on 32-bit.
-
-tvout code only builds on 32-bit, fix build.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/atiscreen.c b/src/atiscreen.c
-index 2957877..b1fbd3c 100644
---- a/src/atiscreen.c
-+++ b/src/atiscreen.c
-@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
- #ifdef TV_OUT
-     /* Fix-up TV out after ImpacTV probe */
-     if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
--        ATISwitchMode(0, pScreenInfo->currentMode, 0);
-+        ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode));
- #endif /* TV_OUT */
- 
- #ifdef XF86DRI_DEVEL
---
-cgit v0.9.0.2-2-gbebe
-From 104e3e067a7dcac143cb672fe42d56396ba6087b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 26 Sep 2012 20:21:25 +0000
-Subject: Don't gratuitously disable Render when ShadowFBing
-
-There's no reason to do this, and I am at a loss to explain why that was
-ever done.  The first instance of this logic comes from xfree86 (over 11
-years ago!):
-
-http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16
-
-Now, cfb never had Render support, so that might make some sense if
-there was an intermediate uncommitted state where the driver used fb for
-direct but cfb for shadowed.  But that's really the only plausible
-explanation I can think of.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/atiscreen.c b/src/atiscreen.c
-index b1fbd3c..62a4dd9 100644
---- a/src/atiscreen.c
-+++ b/src/atiscreen.c
-@@ -476,21 +476,11 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
-         }
-     }
- 
--    /* If applicable, initialise RENDER extension */
-+    /* initialise RENDER extension */
-+    if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1))
-     {
--        if (pATI->OptionShadowFB)
--        {
--            if (serverGeneration == 1)
--                xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
--                    "RENDER extension not supported with a shadowed"
--                    " framebuffer.\n");
--        }
--        else if (!fbPictureInit(pScreen, NULL, 0) &&
--                 (serverGeneration == 1))
--        {
--            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
--                "RENDER extension initialisation failed.\n");
--        }
-+	xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-+	    "RENDER extension initialisation failed.\n");
-     }
- 
-     xf86SetBlackWhitePixels(pScreen);
---
-cgit v0.9.0.2-2-gbebe
-From 42c4e423eec789606eec9703be23a9fd4483a14a Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 02 Oct 2012 14:19:47 +0000
-Subject: Fix build with neither XAA nor EXA against xserver 1.13.0
-
-Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined
-before compat-api.h is parsed, otherwise you fail with:
-
-In file included from /usr/include/xorg/picturestr.h:28:0,
-                 from /usr/include/xorg/exa.h:38,
-                 from atimach64accel.h:31,
-                 from atiscreen.c:46:
-/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token
-/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token
-/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token
-/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/atistruct.h b/src/atistruct.h
-index 702360b..98dc15e 100644
---- a/src/atistruct.h
-+++ b/src/atistruct.h
-@@ -51,6 +51,7 @@
- 
- #endif /* TV_OUT */
- 
-+#include "picturestr.h"
- #ifdef USE_EXA
- #include "exa.h"
- #endif
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-mga/PKGBUILD b/testing/xf86-video-mga/PKGBUILD
deleted file mode 100644
index b6bf63ce0..000000000
--- a/testing/xf86-video-mga/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168230 2012-10-06 20:07:39Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mga
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="X.org mga video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-#makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
-optdepends=('mga-dri: DRI1 support from community repo')
-#conflicts=('xorg-server<1.12.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
-
-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-video-neomagic/PKGBUILD b/testing/xf86-video-neomagic/PKGBUILD
deleted file mode 100644
index 018d54d74..000000000
--- a/testing/xf86-video-neomagic/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168231 2012-10-06 20:07:42Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.7
-pkgrel=2
-pkgdesc="X.org neomagic video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
-
-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-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD
deleted file mode 100644
index 30f70d501..000000000
--- a/testing/xf86-video-nouveau/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169614 2012-10-24 13:01:41Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: buddabrod <buddabrod@gmail.com>
-
-pkgname=xf86-video-nouveau
-pkgver=1.0.3
-pkgrel=1
-pkgdesc="Open Source 2D acceleration driver for nVidia cards"
-arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/"
-license=('GPL')
-depends=('libdrm' 'udev' 'nouveau-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-install=$pkgname.install
-source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a2ae34046324e1ec620f5a8dee3c8fe5a295acbb5d51825604c8ad28fb75a559')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  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 23cc4cd5b..000000000
--- a/testing/xf86-video-nouveau/xf86-video-nouveau.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install () {
-   cat << _EOF
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
-}
diff --git a/testing/xf86-video-openchrome/PKGBUILD b/testing/xf86-video-openchrome/PKGBUILD
deleted file mode 100644
index 6a8b8d02e..000000000
--- a/testing/xf86-video-openchrome/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168233 2012-10-06 20:07:51Z andyrtr $
-# Contributor: Paul Mattal <paul@mattal.com>
-# Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
-
-pkgname=xf86-video-openchrome
-pkgver=0.3.1
-pkgrel=2
-pkgdesc="X.Org Openchrome drivers"
-arch=(i686 x86_64)
-license=('custom')
-url="http://www.openchrome.org"
-depends=('libdrm' 'libxvmc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
-replaces=('openchrome' 'xf86-video-via')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83')
-
-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-video-r128/PKGBUILD b/testing/xf86-video-r128/PKGBUILD
deleted file mode 100644
index 6a3cfca23..000000000
--- a/testing/xf86-video-r128/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168234 2012-10-06 20:07:55Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-r128
-pkgver=6.9.1
-pkgrel=2
-pkgdesc="X.org ati Rage128 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('r128-dri: DRI1 support from community repo')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c')
-
-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-video-rendition/PKGBUILD b/testing/xf86-video-rendition/PKGBUILD
deleted file mode 100644
index 40dd8b335..000000000
--- a/testing/xf86-video-rendition/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168235 2012-10-06 20:07:58Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-rendition
-pkgver=4.2.5
-pkgrel=2
-pkgdesc="X.org Rendition video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool' '!strip')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('930e99e4d44418b1e55f11a2a8525b42b0e2d3b5')
-
-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}/"
-
-  strip --strip-unneeded "${pkgdir}/usr/lib/xorg/modules/drivers/rendition_drv.so"
-}
diff --git a/testing/xf86-video-s3/PKGBUILD b/testing/xf86-video-s3/PKGBUILD
deleted file mode 100644
index 0cceaf7b1..000000000
--- a/testing/xf86-video-s3/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168236 2012-10-06 20:08:02Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-s3
-pkgver=0.6.5
-pkgrel=2
-pkgdesc="X.org S3 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39')
-
-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-video-s3virge/PKGBUILD b/testing/xf86-video-s3virge/PKGBUILD
deleted file mode 100644
index ec5fa6832..000000000
--- a/testing/xf86-video-s3virge/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168237 2012-10-06 20:08:06Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-s3virge
-pkgver=1.10.6
-pkgrel=2
-pkgdesc="X.org S3 Virge video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
-
-
-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-video-savage/PKGBUILD b/testing/xf86-video-savage/PKGBUILD
deleted file mode 100644
index 07fd25006..000000000
--- a/testing/xf86-video-savage/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168238 2012-10-06 20:08:09Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-savage
-pkgver=2.3.6
-pkgrel=2
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('savage-dri: DRI1 support from community repo')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  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 460c8f39f..000000000
--- a/testing/xf86-video-siliconmotion/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168239 2012-10-06 20:08:13Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-siliconmotion
-pkgver=1.7.7
-pkgrel=2
-pkgdesc="X.org siliconmotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa')
-
-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-video-sis/PKGBUILD b/testing/xf86-video-sis/PKGBUILD
deleted file mode 100644
index 29e11db1f..000000000
--- a/testing/xf86-video-sis/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168240 2012-10-06 20:08:16Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sis
-pkgver=0.10.7
-pkgrel=2
-pkgdesc="X.org SiS video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('sis-dri: DRI1 support from community repo')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0')
-
-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-video-sisusb/PKGBUILD b/testing/xf86-video-sisusb/PKGBUILD
deleted file mode 100644
index 28c4fc5a0..000000000
--- a/testing/xf86-video-sisusb/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168241 2012-10-06 20:08:19Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sisusb
-pkgver=0.9.6
-pkgrel=2
-pkgdesc="X.org SiS USB video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046')
-
-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-video-tdfx/PKGBUILD b/testing/xf86-video-tdfx/PKGBUILD
deleted file mode 100644
index 957a803bc..000000000
--- a/testing/xf86-video-tdfx/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168242 2012-10-06 20:08:23Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-tdfx
-pkgver=1.4.5
-pkgrel=2
-pkgdesc="X.org tdfx video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('tdfx-dri: DRI1 support from community repo')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-trident/PKGBUILD b/testing/xf86-video-trident/PKGBUILD
deleted file mode 100644
index 4edcbe491..000000000
--- a/testing/xf86-video-trident/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168243 2012-10-06 20:08:27Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-trident
-pkgver=1.3.6
-pkgrel=2
-pkgdesc="X.org Trident video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104')
-
-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-video-tseng/PKGBUILD b/testing/xf86-video-tseng/PKGBUILD
deleted file mode 100644
index 209f98dd4..000000000
--- a/testing/xf86-video-tseng/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168244 2012-10-06 20:08:30Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-tseng
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="X.org tseng video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819')
-
-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-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 0abdbe466..000000000
--- a/testing/xf86-video-v4l/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168245 2012-10-06 20:08:37Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-v4l
-pkgver=0.2.0
-pkgrel=11
-pkgdesc="X.org v4l video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-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
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  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-v4l/git-fixes.patch b/testing/xf86-video-v4l/git-fixes.patch
deleted file mode 100644
index 2f752fc8c..000000000
--- a/testing/xf86-video-v4l/git-fixes.patch
+++ /dev/null
@@ -1,4362 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index 02fc6fa..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,57 +0,0 @@
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/v4l.c:
--	Bump to 0.1.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/v4l.c: (V4lPutVideo), (V4lPutStill):
--	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/v4l.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 0.1.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-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* man/Makefile.am:
--	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
--
--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 3ae2692..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,6 +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
--EXTRA_DIST = README
-+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 d9ac542..c490919 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,57 +20,56 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-v4l],
--        0.2.0,
-+        [0.2.0],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-v4l)
--
-+        [xf86-video-v4l])
- 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
- 
- 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(XV, videoproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=v4l
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--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/man/v4l.man b/man/v4l.man
-index 7d35b86..dc1e201 100644
---- a/man/v4l.man
-+++ b/man/v4l.man
-@@ -34,6 +34,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details.  This section only covers configuration details specific to this
- driver.
- .SH "SEE ALSO"
--__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
-+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
- .SH AUTHORS
- Authors include: Gerd Knorr <kraxel@bytesex.org>
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ed30a80..08afe60 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,7 +28,6 @@ v4l_drv_la_LTLIBRARIES = v4l_drv.la
- v4l_drv_la_LDFLAGS = -module -avoid-version
- v4l_drv_ladir = @moduledir@/drivers
- 
--v4l_drv_la_SOURCES = \
--         v4l.c
--
--EXTRA_DIST = videodev.h
-+v4l_drv_la_SOURCES =	\
-+	v4l.c		\
-+	videodev.h
-diff --git a/src/v4l.c b/src/v4l.c
-index b827f80..10e782b 100644
---- a/src/v4l.c
-+++ b/src/v4l.c
-@@ -1,6 +1,9 @@
- /*
-- *  video4linux Xv Driver 
-+ *  video4linux Xv Driver
-  *  based on Michael Schimek's permedia 2 driver.
-+ *
-+ * Copyright (c) 2011 Mauro Carvalho Chehab <mchehab@redhat.com> for:
-+ *	- Major rewrite, as driver got ported to V4L2 API
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -9,12 +12,16 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <ctype.h>
-+
- #include <fcntl.h>
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-+#include <unistd.h>
-+#include <sys/ioctl.h>
- 
--#include "videodev.h"
-+#include "videodev2.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "xf86Pci.h"
-@@ -25,8 +32,9 @@
- #include "regionstr.h"
- #include "dgaproc.h"
- #include "xf86str.h"
-+#include "fourcc.h"
- 
--#include <asm/ioctl.h>		/* _IORW(xxx) #defines are here */
-+#include <asm/ioctl.h>          /* _IORW(xxx) #defines are here */
- 
- #if 0
- # define DEBUG(x) (x)
-@@ -34,20 +42,22 @@
- # define DEBUG(x)
- #endif
- 
-+/***************************************************************************/
-+
- static void     V4LIdentify(int flags);
- static Bool     V4LProbe(DriverPtr drv, int flags);
- static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid);
- 
- _X_EXPORT DriverRec V4L = {
--        40000,
--        "v4l",
--        V4LIdentify, /* Identify*/
--        V4LProbe, /* Probe */
--	V4LAvailableOptions,
--        NULL,
--        0
--};    
--
-+    .driverVersion = 50000,
-+    .driverName = "v4l",
-+    .Identify = V4LIdentify,
-+    .Probe = V4LProbe,
-+    .AvailableOptions = V4LAvailableOptions,
-+    .module = NULL,
-+    .refCount = 0,
-+    .driverFunc = NULL,   /* FIXME: Need to implement for new probing mode */
-+};
- 
- #ifdef XFree86LOADER
- 
-@@ -55,16 +65,16 @@ static MODULESETUPPROTO(v4lSetup);
- 
- static XF86ModuleVersionInfo v4lVersRec =
- {
--        "v4l",
--        MODULEVENDORSTRING,
--        MODINFOSTRING1,
--        MODINFOSTRING2,
--        XORG_VERSION_CURRENT,
--        0, 1, 1,
--        ABI_CLASS_VIDEODRV,
--        ABI_VIDEODRV_VERSION,
--        MOD_CLASS_NONE,
--        {0,0,0,0}
-+    "v4l",
-+    MODULEVENDORSTRING,
-+    MODINFOSTRING1,
-+    MODINFOSTRING2,
-+    XORG_VERSION_CURRENT,
-+    0, 1, 1,
-+    ABI_CLASS_VIDEODRV,
-+    ABI_VIDEODRV_VERSION,
-+    MOD_CLASS_NONE,
-+    {0,0,0,0}
- };
- 
- _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
-@@ -72,32 +82,32 @@ _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
- static pointer
- v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- {
--        const char *osname;
--	static Bool setupDone = FALSE;
--
--	if (setupDone) {
--	    if (errmaj)
--		*errmaj = LDR_ONCEONLY;
--	    return NULL;             
--	}
--	
--	setupDone = TRUE;
--
--        /* Check that we're being loaded on a Linux system */
--        LoaderGetOS(&osname, NULL, NULL, NULL);
--        if (!osname || strcmp(osname, "linux") != 0) {
--                if (errmaj)
--                        *errmaj = LDR_BADOS;
--                if (errmin)
--                        *errmin = 0;
--                return NULL;
--        } else {
--                /* OK */
--
--	        xf86AddDriver (&V4L, module, 0);   
--	  
--                return (pointer)1;
--        }
-+    const char *osname;
-+    static Bool setupDone = FALSE;
-+
-+    if (setupDone) {
-+        if (errmaj)
-+            *errmaj = LDR_ONCEONLY;
-+        return NULL;
-+    }
-+
-+    setupDone = TRUE;
-+
-+    /* Check that we're being loaded on a Linux system */
-+    LoaderGetOS(&osname, NULL, NULL, NULL);
-+    if (!osname || strcmp(osname, "linux") != 0) {
-+        if (errmaj)
-+            *errmaj = LDR_BADOS;
-+        if (errmin)
-+            *errmin = 0;
-+        return NULL;
-+    } else {
-+        /* OK */
-+
-+        xf86AddDriver (&V4L, module, 0);
-+
-+        return (pointer)1;
-+    }
- }
- 
- #else
-@@ -112,25 +122,28 @@ v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- #define VIDEO_YUV     2  /* yuv overlay (to offscreen memory + hw scaling) */
- #define VIDEO_RECLIP  3  /* temporarly off, window clipping changes */
- 
-+typedef struct _XvV4LCtrlRec {
-+    struct v4l2_queryctrl       qctrl;
-+    Atom                        xv;
-+} XvV4LCtrlRec, *XvV4LCtrlPtr;
-+
- typedef struct _PortPrivRec {
-     ScrnInfoPtr                 pScrn;
--    FBAreaPtr			pFBArea[2];
--    int				VideoOn;
--    Bool			StreamOn;
-+    FBAreaPtr                   pFBArea[2];
-+    int                         VideoOn;
-+    Bool                        StreamOn;
- 
-     /* file handle */
--    int 			nr;
--    struct video_capability     cap;
-+    int                         nr;
-+    struct v4l2_capability      cap;
- 
-     /* RGB overlay */
--    struct video_buffer		rgb_fbuf;
--    struct video_window		rgb_win;
--    int                         rgbpalette;
-+    struct v4l2_framebuffer     rgb_fbuf;
-+    struct v4l2_window          rgb_win;
-     int                         rgbdepth;
- 
-     /* attributes */
--    struct video_picture	pict;
--    struct video_audio          audio;
-+    CARD32                      pixelformat;
- 
-     XF86VideoEncodingPtr        enc;
-     int                         *input;
-@@ -145,24 +158,21 @@ typedef struct _PortPrivRec {
- 
-     int                         yuv_width,yuv_height;
-     XF86SurfacePtr              surface;
--    struct video_buffer		yuv_fbuf;
--    struct video_window		yuv_win;
--} PortPrivRec, *PortPrivPtr;
-+    struct v4l2_framebuffer     yuv_fbuf;
-+    struct v4l2_window          yuv_win;
-+
-+    struct v4l2_standard        *standard; /* FIXME: can be removed */
- 
--#define XV_ENCODING	"XV_ENCODING"
--#define XV_BRIGHTNESS  	"XV_BRIGHTNESS"
--#define XV_CONTRAST 	"XV_CONTRAST"
--#define XV_SATURATION  	"XV_SATURATION"
--#define XV_HUE		"XV_HUE"
-+    XvV4LCtrlPtr                XvV4LCtrl;
-+    int                         n_qctrl;
-+} PortPrivRec, *PortPrivPtr;
- 
--#define XV_FREQ		"XV_FREQ"
--#define XV_MUTE		"XV_MUTE"
--#define XV_VOLUME      	"XV_VOLUME"
-+#define XV_ENCODING "XV_ENCODING"
-+#define XV_FREQ     "XV_FREQ"
- 
--#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
-+#define MAKE_ATOM(a) MakeAtom(a, strlen(a), TRUE)
- 
--static Atom xvEncoding, xvBrightness, xvContrast, xvSaturation, xvHue;
--static Atom xvFreq, xvMute, xvVolume;
-+static Atom xvEncoding, xvFreq;
- 
- static XF86VideoFormatRec
- InputVideoFormats[] = {
-@@ -176,16 +186,8 @@ InputVideoFormats[] = {
- 
- static const XF86AttributeRec Attributes[] = {
-     {XvSettable | XvGettable, -1000,    1000, XV_ENCODING},
--    {XvSettable | XvGettable, -1000,    1000, XV_BRIGHTNESS},
--    {XvSettable | XvGettable, -1000,    1000, XV_CONTRAST},
--    {XvSettable | XvGettable, -1000,    1000, XV_SATURATION},
--    {XvSettable | XvGettable, -1000,    1000, XV_HUE},
- };
--static const XF86AttributeRec VolumeAttr = 
--    {XvSettable | XvGettable, -1000,    1000, XV_VOLUME};
--static const XF86AttributeRec MuteAttr = 
--    {XvSettable | XvGettable,     0,       1, XV_MUTE};
--static const XF86AttributeRec FreqAttr = 
-+static const XF86AttributeRec FreqAttr =
-     {XvSettable | XvGettable,     0, 16*1000, XV_FREQ};
- 
- 
-@@ -206,59 +208,247 @@ static struct V4L_DEVICE {
- };
- 
- /* ---------------------------------------------------------------------- */
--/* forward decl */
- 
--static void V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion,
--		 short vid_w, short vid_h, short drw_w, short drw_h,
--		 unsigned int *p_w, unsigned int *p_h, pointer data);
-+static int SetV4LFmt(int fd, CARD32 pixelformat)
-+{
-+    struct v4l2_framebuffer fbuf;
-+    char *p = (char *)&pixelformat;
-+
-+    memset(&fbuf, 0, sizeof(fbuf));
-+    if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+        xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+        return errno;
-+    }
-+    if (fbuf.fmt.pixelformat != pixelformat) {
-+        fbuf.fmt.pixelformat = pixelformat;
-+        if (ioctl(fd, VIDIOC_S_FBUF, &fbuf) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d: Can't set FBUF to %c%c%c%c\n",
-+                    errno, p[0], p[1], p[2], p[3]);
-+            return errno;
-+        }
-+    }
-+    DEBUG(xf86Msg(X_INFO, "v4l: Set overlay format to %c%c%c%c\n",
-+                  p[0], p[1], p[2], p[3]));
-+    return 0;
-+}
-+static int GetV4LFmt(int fd, CARD32 *pixelformat)
-+{
-+    struct v4l2_framebuffer fbuf;
-+
-+    memset(&fbuf, 0, sizeof(fbuf));
-+    if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+        xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+        return errno;
-+    }
-+
-+    *pixelformat = fbuf.fmt.pixelformat;
-+
-+    return 0;
-+}
-+
-+#define ATTR_NAME_PREFIX "XV_"
-+static int AddControl(PortPrivPtr p, XF86AttributeRec **list, int *count,
-+                      struct v4l2_queryctrl *qctrl, int *n)
-+{
-+    char *ptr;
-+
-+/* v4l_add_attr */
-+    if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)
-+        return 0;
-+    switch (qctrl->type) {
-+    case V4L2_CTRL_TYPE_INTEGER:
-+    case V4L2_CTRL_TYPE_BOOLEAN:
-+    case V4L2_CTRL_TYPE_MENU:
-+    case V4L2_CTRL_TYPE_BUTTON:
-+        break;
-+    default:
-+        return 0;
-+    }
-+
-+    p->XvV4LCtrl = realloc(p->XvV4LCtrl, sizeof(XvV4LCtrlRec) * (*n + 1));
-+    if (!p->XvV4LCtrl) {
-+        if (*list) {
-+            free (*list);
-+            *count = 0;
-+            *n = 0;
-+        }
-+        return -1;
-+    }
-+
-+    *list = realloc(*list, sizeof(XF86AttributeRec) * (*count + 1));
-+    if (NULL == *list) {
-+        if (p->XvV4LCtrl)
-+            free (p->XvV4LCtrl);
-+        *count = 0;
-+        return -1;
-+    }
-+
-+    memset(*list + *count, 0, sizeof(XF86AttributeRec));
-+    (*list)[*count].flags = XvSettable | XvGettable;
-+
-+    if (qctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
-+        (*list)[*count].flags &= ~XvSettable;
-+    if (qctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY)
-+        (*list)[*count].flags &= ~XvGettable;
-+    (*list)[*count].min_value = qctrl->minimum;
-+    (*list)[*count].max_value = qctrl->maximum;
-+    (*list)[*count].name = malloc(strlen((char *)qctrl->name) + 1 + sizeof (ATTR_NAME_PREFIX));
-+    strcpy((*list)[*count].name, ATTR_NAME_PREFIX);
-+    strcat((*list)[*count].name, (char *)qctrl->name);
-+    for (ptr = (*list)[*count].name; *ptr; ptr++) {
-+        *ptr = toupper(*ptr);
-+        if (*ptr == ' ')
-+            *ptr = '_';
-+    }
-+
-+    p->XvV4LCtrl[*n].xv = MAKE_ATOM((*list)[*count].name);
-+    memcpy(&p->XvV4LCtrl[*n].qctrl, qctrl, sizeof(*qctrl));
-+
-+    xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n",
-+            (*list)[*count].name, (int)p->XvV4LCtrl[*n].xv,
-+            p->XvV4LCtrl[*n].qctrl.minimum,
-+            p->XvV4LCtrl[*n].qctrl.maximum);
-+
-+    (*count)++;
-+    (*n)++;
-+
-+    return 0;
-+}
-+
-+static void AddAllV4LControls(PortPrivPtr p, XF86AttributeRec **list,
-+                              int *count, int fd)
-+{
-+    int entries = 0;
-+    CARD32 id;
-+    struct v4l2_queryctrl qctrl;
-+
-+    memset(&qctrl, 0, sizeof(qctrl));
-+    qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
-+    while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+        if (AddControl(p, list, count, &qctrl, &entries))
-+            return;
-+        qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
-+    }
-+    if (qctrl.id != V4L2_CTRL_FLAG_NEXT_CTRL)
-+        return;
-+    for (id = V4L2_CID_USER_BASE; id < V4L2_CID_LASTP1; id++) {
-+        qctrl.id = id;
-+        if (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+            if (AddControl(p, list, count, &qctrl, &entries))
-+                return;
-+        }
-+    }
-+    qctrl.id = V4L2_CID_PRIVATE_BASE;
-+    while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+        if (AddControl(p, list, count, &qctrl, &entries))
-+            return;
-+        qctrl.id++;
-+    }
-+    p->n_qctrl = entries;
-+}
- 
- /* ---------------------------------------------------------------------- */
- 
-+/* setup yuv overlay + hw scaling: look if we find some common video
-+   format which both v4l driver and the X-Server can handle */
-+static int v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,
-+                          char *dev, int fd)
-+{
-+    static const struct {
-+        CARD32        v4l_palette;
-+        unsigned int  xv_id;
-+        unsigned int  xv_format;
-+    } yuvlist[] = {
-+        { V4L2_PIX_FMT_YUYV, FOURCC_YUY2, XvPacked },
-+        { V4L2_PIX_FMT_UYVY, FOURCC_UYVY, XvPacked },
-+        { 0 /* end of list */ },
-+    };
-+    /* FIXME: Why pScrn->scrnIndex? */
-+    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+    int fmt,i;
-+
-+    pPPriv->format = xf86XVQueryOffscreenImages(pScreen, &pPPriv->nformat);
-+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                   "v4l: Number of Xv formats: %d\n", pPPriv->nformat);
-+    if (!pPPriv->nformat)
-+        return FALSE;
-+
-+    for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) {
-+        pPPriv->pixelformat = yuvlist[fmt].v4l_palette;
-+        if (-1 == SetV4LFmt(fd, pPPriv->pixelformat))
-+            continue;
-+        GetV4LFmt(fd, &pPPriv->pixelformat);
-+        if (pPPriv->pixelformat != yuvlist[fmt].v4l_palette)
-+            continue;
-+        /* ... works, check available offscreen image formats now ... */
-+        for (i = 0; i < pPPriv->nformat; i++) {
-+            if (pPPriv->format[i].image->id == yuvlist[fmt].xv_id &&
-+                pPPriv->format[i].image->format == yuvlist[fmt].xv_format) {
-+                /* ... match found, good. */
-+                pPPriv->yuv_format = yuvlist[fmt].v4l_palette;
-+                pPPriv->myfmt = pPPriv->format+i;
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+                           "v4l[%s]: using hw video scaling [%4.4s].\n",
-+                           dev,(char*)&(pPPriv->format[i].image->id));
-+                return TRUE;
-+            }
-+        }
-+    }
-+    return TRUE;
-+}
-+
- static int V4lOpenDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
- {
-     static int first = 1;
- 
-+#if 0
-+    /*
-+     * It may be a good idea to probe here, but this would break
-+     * some things, as initialization uses yuv_format
-+     */
-+    if (!pPPriv->yuv_format && first)
-+        v4l_check_yuv(pScrn, pPPriv, V4L_NAME, V4L_FD);
-+#endif
-     if (-1 == V4L_FD) {
--	V4L_FD = open(V4L_NAME, O_RDWR, 0);
--
--	pPPriv->rgb_fbuf.width        = pScrn->virtualX;
--	pPPriv->rgb_fbuf.height       = pScrn->virtualY;
--	pPPriv->rgb_fbuf.depth        = pScrn->bitsPerPixel;
--	pPPriv->rgb_fbuf.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
--	pPPriv->rgb_fbuf.base         = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
--	if (first) {
--	    first = 0;
--	    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
--	}
--
--	switch (pScrn->bitsPerPixel) {
--	case 16:
--	    if (pScrn->weight.green == 5) {
--		pPPriv->rgbpalette = VIDEO_PALETTE_RGB555;
--		pPPriv->rgbdepth   = 16;
--	    } else {
--		pPPriv->rgbpalette = VIDEO_PALETTE_RGB565;
--		pPPriv->rgbdepth   = 16;
--	    }
--	    break;
--	case 24:
--	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB24;
--	    pPPriv->rgbdepth   = 24;
--	    break;
--	case 32:
--	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB32;
--	    pPPriv->rgbdepth   = 32;
--	    break;
--	}
-+        V4L_FD = open(V4L_NAME, O_RDWR, 0);
-+
-+        if (-1 == V4L_FD)
-+            return errno;
-+
-+        if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->rgb_fbuf)) {
-+            xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+            return errno;
-+        }
-+        pPPriv->rgb_fbuf.fmt.width        = pScrn->virtualX;
-+        pPPriv->rgb_fbuf.fmt.height       = pScrn->virtualY;
-+        pPPriv->rgb_fbuf.fmt.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
-+        pPPriv->rgb_fbuf.base             = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
-+        if (first) {
-+            xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                           "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
-+            first = 0;
-+        }
-+
-+        switch (pScrn->bitsPerPixel) {
-+        case 16:
-+            if (pScrn->weight.green == 5) {
-+                pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB555;
-+            } else {
-+                pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB565;
-+            }
-+            break;
-+        case 24:
-+            pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR24;
-+            break;
-+        case 32:
-+            pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR32;
-+            break;
-+        }
-     }
- 
--    if (-1 == V4L_FD)
--	return errno;
--    
-     V4L_REF++;
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "Xv/open: refcount=%d\n",V4L_REF));
-+                         "Xv/open: refcount=%d\n",V4L_REF));
- 
-     return 0;
- }
-@@ -267,10 +457,10 @@ static void V4lCloseDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
- {
-     V4L_REF--;
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "Xv/close: refcount=%d\n",V4L_REF));
-+                         "Xv/close: refcount=%d\n",V4L_REF));
-     if (0 == V4L_REF && -1 != V4L_FD) {
--	close(V4L_FD);
--	V4L_FD = -1;
-+        close(V4L_FD);
-+        V4L_FD = -1;
-     }
- }
- 
-@@ -280,8 +470,10 @@ V4lPutVideo(ScrnInfoPtr pScrn,
-     short vid_w, short vid_h, short drw_w, short drw_h,
-     RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
- {
-+    struct v4l2_format fmt;
-+
-     PortPrivPtr pPPriv = (PortPrivPtr) data;
--    struct video_clip *clip;
-+    struct v4l2_clip *clip;
-     BoxPtr pBox;
-     RegionRec newReg;
-     BoxRec    newBox;
-@@ -291,179 +483,214 @@ V4lPutVideo(ScrnInfoPtr pScrn,
- 
-     /* Open a file handle to the device */
-     if (VIDEO_OFF == pPPriv->VideoOn) {
--	if (V4lOpenDevice(pPPriv, pScrn))
--	    return Success;
-+        if (V4lOpenDevice(pPPriv, pScrn))
-+            return Success;
-     }
- 
-     if (0 != pPPriv->yuv_format) {
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
--	width  = pPPriv->enc[pPPriv->cenc].width;
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
-+        width  = pPPriv->enc[pPPriv->cenc].width;
-         height = pPPriv->enc[pPPriv->cenc].height/2; /* no interlace */
--	if (drw_w < width)
--	    width = drw_w;
--	if (drw_h < height)
--	    height = drw_h;
--	if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
--	    /* new size -- free old surface */
--	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
--	    if (pPPriv->surface) {
--		pPPriv->VideoOn = VIDEO_OFF;
--		pPPriv->myfmt->stop(pPPriv->surface);
--		pPPriv->myfmt->free_surface(pPPriv->surface);
--		xfree(pPPriv->surface);
--		pPPriv->surface    = NULL;
--	    }
--	    pPPriv->yuv_width  = width;
--	    pPPriv->yuv_height = height;
--	}
--	if (!pPPriv->surface) {
--	    /* allocate + setup offscreen surface */
--	    if (NULL == (pPPriv->surface = xalloc(sizeof(XF86SurfaceRec))))
--		return FALSE;
--	    if (Success != pPPriv->myfmt->alloc_surface
--		(pScrn,pPPriv->myfmt->image->id,
--		 pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
--		xfree(pPPriv->surface);
--		pPPriv->surface = NULL;
--		goto fallback_to_rgb;
--	    }
--	    pPPriv->yuv_fbuf.width        = pPPriv->surface->width;
--	    pPPriv->yuv_fbuf.height       = pPPriv->surface->height;
--	    pPPriv->yuv_fbuf.depth        = 16;
--	    pPPriv->yuv_fbuf.bytesperline = pPPriv->surface->pitches[0];
--	    pPPriv->yuv_fbuf.base         =
--		(pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
--	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface: %p+%d = %p, %dx%d, pitch %d\n",
--				 pScrn->memPhysBase,pPPriv->surface->offsets[0],
--				 pScrn->memPhysBase+pPPriv->surface->offsets[0],
--				 pPPriv->surface->width,pPPriv->surface->height,
--				 pPPriv->surface->pitches[0]));
--	    pPPriv->yuv_win.width         = pPPriv->surface->width;
--	    pPPriv->yuv_win.height        = pPPriv->surface->height;
--	}
--
--	/* program driver */
--	if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->yuv_fbuf)))
--	    perror("ioctl VIDIOCSFBUF");
--	if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCGPICT");
--	pPPriv->pict.palette = pPPriv->yuv_format;
--	pPPriv->pict.depth   = 16;
--	if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCSPICT");
--	if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->yuv_win)))
--	    perror("ioctl VIDIOCSWIN");
--	if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one))
--	    perror("ioctl VIDIOCCAPTURE(1)");
--
--	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
--	    /* invert cliplist */
--	    newBox.x1 = drw_x;
--	    newBox.y1 = drw_y;
--	    newBox.x2 = drw_x + drw_w;
--	    newBox.y2 = drw_y + drw_h;
--
--	    if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
--		/* trim to the viewport */
--		if(newBox.x1 < pScrn->frameX0)
--		    newBox.x1 = pScrn->frameX0;
--		if(newBox.x2 > pScrn->frameX1)
--		    newBox.x2 = pScrn->frameX1;
--		
--		if(newBox.y1 < pScrn->frameY0)
--		    newBox.y1 = pScrn->frameY0;
--		if(newBox.y2 > pScrn->frameY1)
--		    newBox.y2 = pScrn->frameY1;
--	    }
-+        if (drw_w < width)
-+            width = drw_w;
-+        if (drw_h < height)
-+            height = drw_h;
-+        if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
-+            /* new size -- free old surface */
-+            DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
-+            if (pPPriv->surface) {
-+                pPPriv->VideoOn = VIDEO_OFF;
-+                pPPriv->myfmt->stop(pPPriv->surface);
-+                pPPriv->myfmt->free_surface(pPPriv->surface);
-+                free(pPPriv->surface);
-+                pPPriv->surface    = NULL;
-+            }
-+            pPPriv->yuv_width  = width;
-+            pPPriv->yuv_height = height;
-+        }
-+        if (!pPPriv->surface) {
-+            /* allocate + setup offscreen surface */
-+            if (NULL == (pPPriv->surface = malloc(sizeof(XF86SurfaceRec))))
-+                return FALSE;
-+            if (Success != pPPriv->myfmt->alloc_surface
-+                (pScrn,pPPriv->myfmt->image->id,
-+                pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
-+                free(pPPriv->surface);
-+                pPPriv->surface = NULL;
-+                goto fallback_to_rgb;
-+            }
-+
-+            if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->yuv_fbuf)) {
-+                xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+                return errno;
-+            }
-+            pPPriv->yuv_fbuf.fmt.width        = pPPriv->surface->width;
-+            pPPriv->yuv_fbuf.fmt.height       = pPPriv->surface->height;
-+            pPPriv->yuv_fbuf.fmt.bytesperline = pPPriv->surface->pitches[0];
-+            pPPriv->yuv_fbuf.fmt.pixelformat = pPPriv->yuv_format;
-+            pPPriv->yuv_fbuf.base         =
-+                (pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
-+            DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                                 "  surface: %p+%d = %p, %dx%d, pitch %d\n",
-+                                (void *)pScrn->memPhysBase, pPPriv->surface->offsets[0],
-+                                (void *)pScrn->memPhysBase+pPPriv->surface->offsets[0],
-+                                pPPriv->surface->width, pPPriv->surface->height,
-+                                pPPriv->surface->pitches[0]));
-+            memset(&pPPriv->yuv_win, 0, sizeof(pPPriv->yuv_win));
-+            pPPriv->yuv_win.w.left    = 0;
-+            pPPriv->yuv_win.w.top     = 0;
-+            pPPriv->yuv_win.w.width  = pPPriv->surface->width;
-+            pPPriv->yuv_win.w.height = pPPriv->surface->height;
-+        }
- 
--	    REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
--	    REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
--	    clipBoxes = &newReg;
--	}
--	
--	/* start overlay */
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			     "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
--			     drw_x, drw_y,
--			     drw_x+drw_w, drw_y+drw_h,
--			     drw_w, drw_h,
--			     pPPriv->surface->width,pPPriv->surface->height));
--	pPPriv->myfmt->display(pPPriv->surface,
--			       0, 0, drw_x, drw_y,
--			       pPPriv->surface->width,
--			       pPPriv->surface->height,
--			       drw_w, drw_h,
--			       clipBoxes);
--	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
--	    REGION_UNINIT(pScrn->pScreen, &newReg); 
--	}
--	pPPriv->VideoOn = VIDEO_YUV;
--	return Success;
-+        /* program driver */
-+        if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->yuv_fbuf)) {
-+            xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno);
-+            return BadValue;
-+        }
-+        pPPriv->pixelformat = pPPriv->yuv_format;
-+        if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat))
-+            return BadValue;
-+
-+        memset(&fmt, 0, sizeof(fmt));
-+        fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
-+        memcpy(&fmt.fmt.win, &pPPriv->yuv_win, sizeof(pPPriv->yuv_win));
-+        if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) {
-+            xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno);
-+            return BadValue;
-+        }
-+        if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno);
-+            return BadValue;
-+        }
-+
-+        if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
-+            /* invert cliplist */
-+            newBox.x1 = drw_x;
-+            newBox.y1 = drw_y;
-+            newBox.x2 = drw_x + drw_w;
-+            newBox.y2 = drw_y + drw_h;
-+
-+            if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
-+                /* trim to the viewport */
-+                if(newBox.x1 < pScrn->frameX0)
-+                    newBox.x1 = pScrn->frameX0;
-+                if(newBox.x2 > pScrn->frameX1)
-+                    newBox.x2 = pScrn->frameX1;
-+
-+                if(newBox.y1 < pScrn->frameY0)
-+                    newBox.y1 = pScrn->frameY0;
-+                if(newBox.y2 > pScrn->frameY1)
-+                    newBox.y2 = pScrn->frameY1;
-+            }
-+
-+            REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
-+            REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
-+            clipBoxes = &newReg;
-+        }
-+
-+        /* start overlay */
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                             "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
-+                             drw_x, drw_y,
-+                             drw_x+drw_w, drw_y+drw_h,
-+                             drw_w, drw_h,
-+                             pPPriv->surface->width,pPPriv->surface->height));
-+        pPPriv->myfmt->display(pPPriv->surface,
-+                               0, 0, drw_x, drw_y,
-+                               pPPriv->surface->width,
-+                               pPPriv->surface->height,
-+                               drw_w, drw_h,
-+                               clipBoxes);
-+        if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
-+            REGION_UNINIT(pScrn->pScreen, &newReg);
-+        }
-+        pPPriv->VideoOn = VIDEO_YUV;
-+        return Success;
-     }
- 
-- fallback_to_rgb:
-+fallback_to_rgb:
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV rgb\n"));
-     /* FIXME: vid-* is ignored for now, not supported by v4l */
- 
-     dw = (drw_w < pPPriv->enc[pPPriv->cenc].width) ?
--	drw_w : pPPriv->enc[pPPriv->cenc].width;
-+        drw_w : pPPriv->enc[pPPriv->cenc].width;
-     dh = (drw_h < pPPriv->enc[pPPriv->cenc].height) ?
--	drw_h : pPPriv->enc[pPPriv->cenc].height;
-+        drw_h : pPPriv->enc[pPPriv->cenc].height;
-     /* if the window is too big, center the video */
-     dx = drw_x + (drw_w - dw)/2;
-     dy = drw_y + (drw_h - dh)/2;
-     /* bttv prefeares aligned addresses */
-     dx &= ~3;
--    if (dx < drw_x) dx += 4;
--    if (dx+dw > drw_x+drw_w) dw -= 4;
-+    if (dx < drw_x)
-+        dx += 4;
-+    if (dx+dw > drw_x+drw_w)
-+        dw -= 4;
- 
-     /* window */
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  win: %dx%d+%d+%d\n",
--		drw_w,drw_h,drw_x,drw_y));
-+                         drw_w,drw_h,drw_x,drw_y));
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  use: %dx%d+%d+%d\n",
--		dw,dh,dx,dy));
--    pPPriv->rgb_win.x      = dx;
--    pPPriv->rgb_win.y      = dy;
--    pPPriv->rgb_win.width  = dw;
--    pPPriv->rgb_win.height = dh;
--    pPPriv->rgb_win.flags  = 0;
-- 
-+                         dw,dh,dx,dy));
-+    memset(&pPPriv->rgb_win, 0, sizeof(pPPriv->rgb_win));
-+    pPPriv->rgb_win.w.left   = dx;
-+    pPPriv->rgb_win.w.top    = dy;
-+    pPPriv->rgb_win.w.width  = dw;
-+    pPPriv->rgb_win.w.height = dh;
-+
-     /* clipping */
-     if (pPPriv->rgb_win.clips) {
--	xfree(pPPriv->rgb_win.clips);
--	pPPriv->rgb_win.clips = NULL;
-+        free(pPPriv->rgb_win.clips);
-+        pPPriv->rgb_win.clips = NULL;
-     }
-     pPPriv->rgb_win.clipcount = REGION_NUM_RECTS(clipBoxes);
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,"  clip: have #%d\n",
--		pPPriv->rgb_win.clipcount));
-+                         pPPriv->rgb_win.clipcount));
-     if (0 != pPPriv->rgb_win.clipcount) {
--	pPPriv->rgb_win.clips = xalloc(pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
--	if (NULL != pPPriv->rgb_win.clips) {
--	    memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
--	    pBox = REGION_RECTS(clipBoxes);
--	    clip = pPPriv->rgb_win.clips;
--	    for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
--		clip->x	 = pBox->x1 - dx;
--		clip->y      = pBox->y1 - dy;
--		clip->width  = pBox->x2 - pBox->x1;
--		clip->height = pBox->y2 - pBox->y1;
--	    }
--	}
-+        pPPriv->rgb_win.clips = malloc(pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip));
-+        if (NULL != pPPriv->rgb_win.clips) {
-+            memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip));
-+            pBox = REGION_RECTS(clipBoxes);
-+            clip = pPPriv->rgb_win.clips;
-+
-+            /*
-+             * FIXME: This code currently does nothing, as we don't emulate
-+             * The V4L1 clipping stuff
-+             */
-+            for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
-+                clip->c.left   = pBox->x1 - dx;
-+                clip->c.top    = pBox->y1 - dy;
-+                clip->c.width  = pBox->x2 - pBox->x1;
-+                clip->c.height = pBox->y2 - pBox->y1;
-+            }
-+        }
-     }
- 
-     /* start */
--    if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->rgb_fbuf)))
--	perror("ioctl VIDIOCSFBUF");
--    if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict))
--	perror("ioctl VIDIOCGPICT");
--    pPPriv->pict.palette = pPPriv->rgbpalette;
--    pPPriv->pict.depth   = pPPriv->rgbdepth;
--    if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	perror("ioctl VIDIOCSPICT");
--    if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->rgb_win)))
--	perror("ioctl VIDIOCSWIN");
--    if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one))
--	perror("ioctl VIDIOCCAPTURE(1)");
-+    if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->rgb_fbuf)) {
-+        xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno);
-+        return BadValue;
-+    }
-+    if (-1 == GetV4LFmt(V4L_FD, &pPPriv->pixelformat)) {
-+        xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno);
-+        return BadValue;
-+    }
-+    pPPriv->pixelformat = pPPriv->rgb_fbuf.fmt.pixelformat;
-+    if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat)) {
-+        xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno);
-+        return BadValue;
-+    }
-+    memset(&fmt, 0, sizeof(fmt));
-+    fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
-+    memcpy(&fmt.fmt.win, &pPPriv->rgb_win, sizeof(pPPriv->rgb_win));
-+    if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) {
-+        xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno);
-+        return BadValue;
-+    }
-+    if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) {
-+        xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno);
-+        return BadValue;
-+    }
-     pPPriv->VideoOn = VIDEO_RGB;
- 
-     return Success;
-@@ -476,7 +703,7 @@ V4lPutStill(ScrnInfoPtr pScrn,
-     RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
- {
- #if 0
--    PortPrivPtr pPPriv = (PortPrivPtr) data;  
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
- #endif
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PS\n"));
-@@ -488,177 +715,152 @@ V4lPutStill(ScrnInfoPtr pScrn,
- static void
- V4lStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
- {
--    PortPrivPtr pPPriv = (PortPrivPtr) data;  
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
-     int zero=0;
- 
-     if (VIDEO_OFF == pPPriv->VideoOn) {
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--	      "Xv/StopVideo called with video already off\n"));
--	return;
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+              "Xv/StopVideo called with video already off\n"));
-+        return;
-     }
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/StopVideo shutdown=%d\n",shutdown));
- 
-     if (!shutdown) {
--	/* just reclipping, we have to stop DMA transfers to the visible screen */
--	if (VIDEO_RGB == pPPriv->VideoOn) {
--	    if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero))
--		perror("ioctl VIDIOCCAPTURE(0)");
--	    pPPriv->VideoOn = VIDEO_RECLIP;
--	}
-+        /* just reclipping, we have to stop DMA transfers to the visible screen */
-+        if (VIDEO_RGB == pPPriv->VideoOn) {
-+            if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero))
-+                xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno);
-+            pPPriv->VideoOn = VIDEO_RECLIP;
-+        }
-     } else {
--	/* video stop - turn off and free everything */
--	if (VIDEO_YUV == pPPriv->VideoOn) {
--	    pPPriv->myfmt->stop(pPPriv->surface);
--	    pPPriv->myfmt->free_surface(pPPriv->surface);
--	    xfree(pPPriv->surface);
--	    pPPriv->surface = NULL;
--	}
--	if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero))
--	    perror("ioctl VIDIOCCAPTURE(0)");
--	
--	V4lCloseDevice(pPPriv,pScrn);
--	pPPriv->VideoOn = VIDEO_OFF;
--    }
--}
-+        /* video stop - turn off and free everything */
-+        if (VIDEO_YUV == pPPriv->VideoOn) {
-+            pPPriv->myfmt->stop(pPPriv->surface);
-+            pPPriv->myfmt->free_surface(pPPriv->surface);
-+            free(pPPriv->surface);
-+            pPPriv->surface = NULL;
-+        }
-+        if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero))
-+            xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno);
- 
--/* v4l uses range 0 - 65535; Xv uses -1000 - 1000 */
--static int
--v4l_to_xv(int val) {
--    val = val * 2000 / 65536 - 1000;
--    if (val < -1000) val = -1000;
--    if (val >  1000) val =  1000;
--    return val;
--}
--static int
--xv_to_v4l(int val) {
--    val = val * 65536 / 2000 + 32768;
--    if (val <    -0) val =     0;
--    if (val > 65535) val = 65535;
--    return val;
-+        V4lCloseDevice(pPPriv,pScrn);
-+        pPPriv->VideoOn = VIDEO_OFF;
-+    }
- }
- 
- static int
- V4lSetPortAttribute(ScrnInfoPtr pScrn,
-     Atom attribute, INT32 value, pointer data)
- {
--    PortPrivPtr pPPriv = (PortPrivPtr) data; 
--    struct video_channel chan;
--    int ret = Success;
-+    struct v4l2_control ctrl;
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
-+    int i, ret = BadValue;
- 
-     if (V4lOpenDevice(pPPriv, pScrn))
--	return Success;
-+        return Success;
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/SPA %d, %d\n",
--			 attribute, value));
-+                        (int)attribute, (int)value));
- 
-     if (-1 == V4L_FD) {
--	ret = Success;
-+        ret = Success;
-     } else if (attribute == xvEncoding) {
--	if (value >= 0 && value < pPPriv->nenc) {
--	    pPPriv->cenc = value;
--	    chan.channel = pPPriv->input[value];
--	    chan.norm    = pPPriv->norm[value];
--	    if (-1 == ioctl(V4L_FD,VIDIOCSCHAN,&chan))
--		perror("ioctl VIDIOCSCHAN");
--	} else {
--	    ret = BadValue;
--	}
--    } else if (attribute == xvBrightness ||
--               attribute == xvContrast   ||
--               attribute == xvSaturation ||
--               attribute == xvHue) {
--	ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict);
--	if (attribute == xvBrightness) pPPriv->pict.brightness = xv_to_v4l(value);
--	if (attribute == xvContrast)   pPPriv->pict.contrast   = xv_to_v4l(value);
--	if (attribute == xvSaturation) pPPriv->pict.colour     = xv_to_v4l(value);
--	if (attribute == xvHue)        pPPriv->pict.hue        = xv_to_v4l(value);
--	if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCSPICT");
--    } else if (attribute == xvMute ||
--	       attribute == xvVolume) {
--	ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio);
--	if (attribute == xvMute) {
--	    if (value)
--		pPPriv->audio.flags |= VIDEO_AUDIO_MUTE;
--	    else
--		pPPriv->audio.flags &= ~VIDEO_AUDIO_MUTE;
--	} else if (attribute == xvVolume) {
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		pPPriv->audio.volume = xv_to_v4l(value);
--	} else {
--	    ret = BadValue;
--	}
--	if (ret != BadValue)
--	    if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio))
--		perror("ioctl VIDIOCSAUDIO");
-+        if (value < 0 || value >= pPPriv->nenc)
-+            goto err;
-+        if (ioctl(V4L_FD, VIDIOC_S_INPUT, &pPPriv->input[value]) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting input\n", errno);
-+            goto err;
-+        }
-+        if (ioctl(V4L_FD, VIDIOC_S_STD, &pPPriv->norm[value]) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting standard\n", errno);
-+            goto err;
-+        }
-+        pPPriv->cenc = value;
-+        ret = Success;
-     } else if (attribute == xvFreq) {
--	unsigned long freq = value;
--	if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq))
--	    perror("ioctl VIDIOCSFREQ");
--    } else if (0 != pPPriv->yuv_format &&
--	       pPPriv->myfmt->setAttribute) {
--	/* not mine -> pass to yuv scaler driver */
--	ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
-+        struct v4l2_frequency   freq;
-+        memset(&freq, 0, sizeof(freq));
-+        ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq);
-+        freq.frequency = value;
-+        if (ioctl(V4L_FD, VIDIOC_S_FREQUENCY, &freq) == -1)
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting frequency\n", errno);
-+        else
-+            ret = Success;
-     } else {
--	ret = BadValue;
-+        for (i = 0; i < pPPriv->n_qctrl; i++)
-+            if (pPPriv->XvV4LCtrl[i].xv == attribute)
-+                break;
-+        if (i == pPPriv->n_qctrl) {
-+            /* not mine -> pass to yuv scaler driver */
-+            if (0 != pPPriv->yuv_format && pPPriv->myfmt->setAttribute)
-+                ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
-+            else
-+                ret = BadMatch;
-+            goto err;
-+        }
-+        if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-+            goto err;
-+        ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id;
-+        ctrl.value = value;
-+        if (ioctl(V4L_FD, VIDIOC_S_CTRL, &ctrl) != 1)
-+            ret = Success;
-     }
- 
-+err:
-     V4lCloseDevice(pPPriv,pScrn);
-     return ret;
- }
- 
- static int
--V4lGetPortAttribute(ScrnInfoPtr pScrn, 
-+V4lGetPortAttribute(ScrnInfoPtr pScrn,
-     Atom attribute, INT32 *value, pointer data)
- {
-+    struct v4l2_control ctrl;
-     PortPrivPtr pPPriv = (PortPrivPtr) data;
--    int ret = Success;
-+    int i, ret = BadValue;
- 
-     if (V4lOpenDevice(pPPriv, pScrn))
--	return Success;
-+        return Success;
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d\n",
--			 attribute));
-+                        (int)attribute));
- 
-     if (-1 == V4L_FD) {
--	ret = Success;
-+        ret = Success;
-     } else if (attribute == xvEncoding) {
--	*value = pPPriv->cenc;
--    } else if (attribute == xvBrightness ||
--               attribute == xvContrast   ||
--               attribute == xvSaturation ||
--               attribute == xvHue) {
--	ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict);
--	if (attribute == xvBrightness) *value = v4l_to_xv(pPPriv->pict.brightness);
--	if (attribute == xvContrast)   *value = v4l_to_xv(pPPriv->pict.contrast);
--	if (attribute == xvSaturation) *value = v4l_to_xv(pPPriv->pict.colour);
--	if (attribute == xvHue)        *value = v4l_to_xv(pPPriv->pict.hue);
--    } else if (attribute == xvMute ||
--	       attribute == xvVolume) {
--	ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio);
--	if (attribute == xvMute) {
--	    *value = (pPPriv->audio.flags & VIDEO_AUDIO_MUTE) ? 1 : 0;
--	} else if (attribute == xvVolume) {
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		*value = v4l_to_xv(pPPriv->audio.volume);
--	} else {
--	    ret = BadValue;
--	}
-+        *value = pPPriv->cenc;
-+        ret = Success;
-     } else if (attribute == xvFreq) {
--	unsigned long freq;
--	ioctl(V4L_FD,VIDIOCGFREQ,&freq);
--	*value = freq;
--    } else if (0 != pPPriv->yuv_format &&
--	       pPPriv->myfmt->getAttribute) {
--	/* not mine -> pass to yuv scaler driver */
--	ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
-+        struct v4l2_frequency   freq;
-+        memset(&freq, 0, sizeof(freq));
-+        if (ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq) != -1) {
-+            *value = freq.frequency;
-+            ret = Success;
-+        }
-     } else {
--	ret = BadValue;
-+        for (i = 0; i < pPPriv->n_qctrl; i++)
-+            if (pPPriv->XvV4LCtrl[i].xv == attribute)
-+                break;
-+        if (i == pPPriv->n_qctrl) {
-+            /* not mine -> pass to yuv scaler driver */
-+            if (0 != pPPriv->yuv_format &&  pPPriv->myfmt->getAttribute)
-+                ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
-+            else
-+                ret = BadMatch;
-+            goto err;
-+        }
-+        if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-+            goto err;
-+        ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id;
-+        if (ioctl(V4L_FD, VIDIOC_G_CTRL, &ctrl) != -1) {
-+            *value = ctrl.value;
-+            ret = Success;
-+        }
-     }
--
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d, %d\n",
--	attribute, *value));
-+        (int)attribute, (int)*value));
- 
-+err:
-     V4lCloseDevice(pPPriv,pScrn);
-     return ret;
- }
-@@ -673,15 +875,15 @@ V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion,
-     int maxy = pPPriv->enc[pPPriv->cenc].height;
- 
-     if (0 != pPPriv->yuv_format) {
--	*p_w = pPPriv->myfmt->max_width;
--	*p_h = pPPriv->myfmt->max_height;
-+        *p_w = pPPriv->myfmt->max_width;
-+        *p_h = pPPriv->myfmt->max_height;
-     } else {
--	*p_w = (drw_w < maxx) ? drw_w : maxx;
--	*p_h = (drw_h < maxy) ? drw_h : maxy;
-+        *p_w = (drw_w < maxx) ? drw_w : maxx;
-+        *p_h = (drw_h < maxy) ? drw_h : maxy;
-     }
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/BS %d %dx%d %dx%d\n",
--			 pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
-+                         pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
- }
- 
- static const OptionInfoRec *
-@@ -693,132 +895,198 @@ V4LAvailableOptions(int chipid, int busid)
- static void
- V4LIdentify(int flags)
- {
--    xf86Msg(X_INFO, "v4l driver for Video4Linux\n");
--}        
-+    xf86Msg(X_INFO, "v4l driver for Video4Linux overlay mode (V4L2)\n");
-+}
- 
- static char*
- fixname(char *str)
- {
-     int s,d;
-     for (s=0, d=0;; s++) {
--	if (str[s] == '-')
--	    continue;
--	str[d++] = tolower(str[s]);
--	if (0 == str[s])
--	    break;
-+        if (str[s] == '-')
-+            continue;
-+        str[d++] = tolower(str[s]);
-+        if (0 == str[s])
-+            break;
-     }
-     return str;
- }
- 
- static int
--v4l_add_enc(XF86VideoEncodingPtr enc, int i,
--	    char *norm, char *input, int width, int height, int n, int d)
-+AddV4LEnc(XF86VideoEncodingPtr enc, int entry,
-+            char *norm, char *input, int width, int height, int n, int d)
- {
--    enc[i].id     = i;
--    enc[i].name   = xalloc(strlen(norm)+strlen(input)+2);
--    if (NULL == enc[i].name)
--	return -1;
--    enc[i].width  = width;
--    enc[i].height = height;
--    enc[i].rate.numerator   = n;
--    enc[i].rate.denominator = d;
--    sprintf(enc[i].name,"%s-%s",norm,fixname(input));
-+    enc->id     = entry;
-+    enc->name   = malloc(strlen(norm) + strlen(input) + 2);
-+    if (!enc->name)
-+        return -1;
-+
-+    enc->width  = width;
-+    enc->height = height;
-+    enc->rate.numerator   = n;
-+    enc->rate.denominator = d * 2; /* Refresh rate is twice, due to interlace */
-+    sprintf(enc->name,"%s-%s",norm,fixname(input));
-+
-+    xf86Msg(X_INFO, "v4l: adding input %s, %dx%d %d fps\n",
-+            enc->name, enc->width, enc->height, (d + n - 1)/n);
-+
-     return 0;
- }
- 
-+static int
-+V4LGetStd(PortPrivPtr p, int fd)
-+{
-+    struct v4l2_standard standard;
-+    int entries = 0;
-+
-+    /*
-+     * 128 is just an arbitrary large number. There aren't that many video stds
-+     * The max value is there just to avoid an endless loop, if the driver is
-+     * broken.
-+     */
-+    for (entries = 0; entries < 128; entries++) {
-+        memset(&standard, 0, sizeof(standard));
-+        standard.index = entries;
-+        if (-1 == ioctl(fd,VIDIOC_ENUMSTD, &standard))
-+            break;
-+        p->standard = realloc(p->standard, sizeof(standard) * (entries + 1));
-+        memcpy(&p->standard[entries], &standard, sizeof(standard));
-+    }
-+
-+    /*
-+     * Some webcam drivers don't implement VIDIOC_ENUMSTD. Fake it
-+     * This is currently unused, as no webcam driver allows OVERLAY mode,
-+     * but the code is here, in the case some webcam driver starts allowing
-+     * overlay.
-+     * FIXME: Webcam drivers may use VIDIOC_ENUM_FRAMESIZES and
-+     * VIDIOC_ENUM_FRAMEINTERVALS ioctl's that may help to fine-tune
-+     * their needs. Those ioctl's could be used here in order to better
-+     * support webcams.
-+     */
-+    if (!entries) {
-+        xf86Msg(X_INFO, "v4l: VIDIOC_ENUMSTD error %d.\n",errno);
-+        p->standard = realloc(p->standard, sizeof(standard) * (entries + 1));
-+        p->standard[0].id = V4L2_STD_ALL;
-+        strcpy((char *)p->standard[0].name, "CAMERA");
-+        p->standard[0].frameperiod.numerator = 1001;
-+        p->standard[0].frameperiod.denominator = 300001;
-+        p->standard[0].framelines = 480;
-+        entries++;
-+    }
-+    return entries;
-+}
-+
- static void
--V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
-+V4LBuildEncodings(PortPrivPtr p, int fd)
- {
--    static struct video_channel     channel;
--    int i,entries,have_bttv,bttv_ver;
--
--#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
--    have_bttv = 0;
--    if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
--	have_bttv = 1;
--	
--    entries = (have_bttv ? 7 : 3) * channels;
--    p->enc = xalloc(sizeof(XF86VideoEncodingRec) * entries);
--    if (NULL == p->enc)
--	goto fail;
--    memset(p->enc,0,sizeof(XF86VideoEncodingRec) * entries);
--    p->norm = xalloc(sizeof(int) * entries);
--    if (NULL == p->norm)
--	goto fail;
--    memset(p->norm,0,sizeof(int) * entries);
--    p->input = xalloc(sizeof(int) * entries);
--    if (NULL == p->input)
--	goto fail;
--    memset(p->input,0,sizeof(int) * entries);
-+    unsigned int inp, std, num_std;
-+
-+    num_std =  V4LGetStd(p, fd);
- 
-     p->nenc = 0;
--    for (i = 0; i < channels; i++) {
--	channel.channel = i;
--	if (-1 == ioctl(fd,VIDIOCGCHAN,&channel)) {
--	    perror("ioctl VIDIOCGCHAN");
--	    continue;
--	}
--	
--	v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50);
--	p->norm[p->nenc]  = VIDEO_MODE_PAL;
--	p->input[p->nenc] = i;
--	p->nenc++;
--	
--	v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000);
--	p->norm[p->nenc]  = VIDEO_MODE_NTSC;
--	p->input[p->nenc] = i;
--	p->nenc++;
--	
--	v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50);
--	p->norm[p->nenc]  = VIDEO_MODE_SECAM;
--	p->input[p->nenc] = i;
--	p->nenc++;
--
--	if (have_bttv) {
--	    /* workaround for a v4l design flaw:  The v4l API knows just pal,
--	       ntsc and secam.  But there are a few more norms (pal versions
--	       with a different timings used in south america for example).
--	       The bttv driver can handle these too. */
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name,
--				 640, 576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 3;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name,
--				 640, 576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 4;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--
--	    if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name,
--				 768,576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 5;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--	    
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name,
--				 640,480, 1001,60000))
--		goto fail;
--	    p->norm[p->nenc]  = 6;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--	}
-+
-+    /*
-+     * 256 is just an arbitrary large number. There aren't that many video
-+     * inputs on any driver. The max value is there just to avoid an endless
-+     * loop, if the driver is broken.
-+     */
-+    for (inp = 0; inp < 256; inp++) {
-+        struct v4l2_input       input;
-+
-+        memset(&input, 0, sizeof(input));
-+        input.index = inp;
-+        if (ioctl(fd, VIDIOC_ENUMINPUT, &input) == -1)
-+            break;
-+
-+        for (std = 0; std < num_std; std++) {
-+            int width, height;
-+
-+	    /*
-+	     * Currently, this code is not reliable, due to driver
-+	     * non-compliance on both saa7134 and bttv. So, instead,
-+	     * just use the video standard information
-+	     */
-+#if 0
-+	    struct v4l2_framebuffer fbuf;
-+
-+            /* Some webcam drivers will fail here, but that's OK */
-+            ioctl(fd, VIDIOC_S_STD, &p->standard[std].id);
-+
-+            memset(&fbuf, 0, sizeof(fbuf));
-+            if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+                xf86Msg(X_INFO, "v4l: Error %d: Can't get FBUF\n", errno);
-+                return;
-+            }
-+            height = fbuf.fmt.height;
-+            width = fbuf.fmt.width;
-+
-+            /*
-+             * If the overlay method fails, get the resolution
-+             * via checking V4L2_BUF_TYPE_VIDEO_CAPTURE
-+             */
-+            if (!height || !width) {
-+                struct v4l2_format format;
-+
-+                format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                if (ioctl(fd, VIDIOC_G_FMT, &format) == -1) {
-+                    /* Hmm... device doesn't support capture. */
-+                    height = p->standard[std].framelines;
-+                    if (height == 480)
-+                        width = 640;
-+                    else if (height == 576)
-+                        width = 768;
-+                    else
-+                        continue;
-+                } else {
-+                    height = format.fmt.pix.height;
-+                    width = format.fmt.pix.width;
-+                }
-+            }
-+#else
-+	    if (p->standard[std].id & V4L2_STD_525_60) {
-+		height = 480;
-+		width = 640;
-+	    } else {
-+		height = 576;
-+		width = 768;
-+	    }
-+
-+#endif
-+            /* Fixup for some driver bug */
-+            if ((p->standard[std].id & V4L2_STD_525_60) && (height == 576))
-+                height = 480;
-+
-+            p->enc = realloc(p->enc, sizeof(XF86VideoEncodingRec) * (p->nenc + 1));
-+            p->norm = realloc(p->norm, sizeof(int) * (p->nenc + 1));
-+            p->input = realloc(p->input, sizeof(int) * (p->nenc + 1));
-+            if (!p->enc || !p->norm || !p->input)
-+                goto fail;
-+            if (AddV4LEnc(&p->enc[p->nenc], p->nenc,
-+                          (char *)p->standard[std].name,
-+                          (char *)input.name, width, height,
-+                          p->standard[std].frameperiod.numerator,
-+                          p->standard[std].frameperiod.denominator))
-+                goto fail;
-+            p->norm[p->nenc]  = p->standard[std].id;
-+            p->input[p->nenc] = inp;
-+            p->nenc++;
-+        }
-     }
-+
-+    if (!p->nenc)
-+        xf86Msg(X_ERROR, "v4l: couldn't detect any valid input/standard\n");
-     return;
--    
-- fail:
-+
-+fail:
-+    xf86Msg(X_ERROR, "v4l: Fail to get standards: %d\n", errno);
-     if (p->input)
--	xfree(p->input);
-+        free(p->input);
-     p->input = NULL;
-     if (p->norm)
--	xfree(p->norm);
-+        free(p->norm);
-     p->norm = NULL;
-     if (p->enc)
--	xfree(p->enc);
-+        free(p->enc);
-     p->enc = NULL;
-     p->nenc = 0;
- }
-@@ -826,73 +1094,33 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
- /* add a attribute a list */
- static void
- v4l_add_attr(XF86AttributeRec **list, int *count,
--	     const XF86AttributeRec *attr)
-+             const XF86AttributeRec *attr)
- {
-     XF86AttributeRec *oldlist = *list;
-     int i;
-+    Atom gpa;
- 
-     for (i = 0; i < *count; i++) {
--	if (0 == strcmp((*list)[i].name,attr->name)) {
--	    DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name));
--	    return;
--	}
-+        if (0 == strcmp((*list)[i].name,attr->name)) {
-+            DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name));
-+            return;
-+        }
-     }
--    
--    DEBUG(xf86Msg(X_INFO, "v4l: add attr %s\n",attr->name));
--    *list = xalloc((*count + 1) * sizeof(XF86AttributeRec));
-+
-+    *list = malloc((*count + 1) * sizeof(XF86AttributeRec));
-     if (NULL == *list) {
--	*count = 0;
--	return;
-+        *count = 0;
-+        return;
-     }
-     if (*count)
--	memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec));
-+        memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec));
-     memcpy(*list + *count, attr, sizeof(XF86AttributeRec));
--    (*count)++;
--}
- 
--/* setup yuv overlay + hw scaling: look if we find some common video
--   format which both v4l driver and the X-Server can handle */
--static void v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,
--			  char *dev, int fd)
--{
--    static const struct {
--	unsigned int  v4l_palette;
--	unsigned int  v4l_depth;
--	unsigned int  xv_id;
--	unsigned int  xv_format;
--    } yuvlist[] = {
--	{ VIDEO_PALETTE_YUV422, 16, 0x32595559, XvPacked },
--	{ VIDEO_PALETTE_UYVY,   16, 0x59565955, XvPacked },
--	{ 0 /* end of list */ },
--    };
--    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
--    int fmt,i;
-+    gpa = MAKE_ATOM((*list)[*count].name);
-+    xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n",
-+            attr->name, (int)gpa, attr->min_value, attr->max_value);
- 
--    pPPriv->format = xf86XVQueryOffscreenImages(pScreen,&pPPriv->nformat);
--    for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) {
--	/* check v4l ... */
--	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
--	pPPriv->pict.palette = yuvlist[fmt].v4l_palette;
--	pPPriv->pict.depth   = yuvlist[fmt].v4l_depth;
--	if (-1 == ioctl(fd,VIDIOCSPICT,&pPPriv->pict))
--	    continue;
--	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
--	if (pPPriv->pict.palette != yuvlist[fmt].v4l_palette)
--	    continue;
--	/* ... works, check available offscreen image formats now ... */
--	for (i = 0; i < pPPriv->nformat; i++) {
--	    if (pPPriv->format[i].image->id     == yuvlist[fmt].xv_id &&
--		pPPriv->format[i].image->format == yuvlist[fmt].xv_format) {
--		/* ... match found, good. */
--		pPPriv->yuv_format = yuvlist[fmt].v4l_palette;
--		pPPriv->myfmt = pPPriv->format+i;
--		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--			   "v4l[%s]: using hw video scaling [%4.4s].\n",
--			   dev,(char*)&(pPPriv->format[i].image->id));
--		return;
--	    }
--	}
--    }
-+    (*count)++;
- }
- 
- static int
-@@ -904,118 +1132,114 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
-     char dev[18];
-     int  fd,i,j,d;
- 
--    DEBUG(xf86Msg(X_INFO, "v4l: init start\n"));
--
-     for (i = 0, d = 0; d < MAX_V4L_DEVICES; d++) {
--	sprintf(dev, "/dev/video%d", d);
--	fd = open(dev, O_RDWR, 0);
--	if (fd == -1) {
--	    sprintf(dev, "/dev/v4l/video%d", d);
--	    fd = open(dev, O_RDWR, 0);
--	    if (fd == -1)
--		break;
--	}
--	DEBUG(xf86Msg(X_INFO,  "v4l: %s open ok\n",dev));
--
--	/* our private data */
--	pPPriv = xalloc(sizeof(PortPrivRec));
--	if (!pPPriv)
--	    return FALSE;
--	memset(pPPriv,0,sizeof(PortPrivRec));
--	pPPriv->nr = d;
--
--	/* check device */
--	if (-1 == ioctl(fd,VIDIOCGCAP,&pPPriv->cap) ||
--	    0 == (pPPriv->cap.type & VID_TYPE_OVERLAY)) {
--	    DEBUG(xf86Msg(X_INFO,  "v4l: %s: no overlay support\n",dev));
--	    xfree(pPPriv);
--	    close(fd);
--	    continue;
--	}
--	strncpy(V4L_NAME, dev, 16);
--	V4LBuildEncodings(pPPriv,fd,pPPriv->cap.channels);
--	if (NULL == pPPriv->enc)
--	    return FALSE;
--	v4l_check_yuv(pScrn,pPPriv,dev,fd);
--	
--	/* alloc VideoAdaptorRec */
--	VAR = xrealloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
--	VAR[i] = xalloc(sizeof(XF86VideoAdaptorRec));
--	if (!VAR[i])
--	    return FALSE;
--	memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
--
--
--	/* build attribute list */
--	for (j = 0; j < V4L_ATTR; j++) {
--	    /* video attributes */
--	    v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			 &Attributes[j]);
--	}
--	if (0 == ioctl(fd,VIDIOCGAUDIO,&pPPriv->audio)) {
--	    /* audio attributes */
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     &VolumeAttr);
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_MUTABLE)
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     &MuteAttr);
--	}
--	if (pPPriv->cap.type & VID_TYPE_TUNER) {
--	    /* tuner attributes */
--	    v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			 &FreqAttr);
--	}
--	if (0 != pPPriv->yuv_format) {
--	    /* pass throuth scaler attributes */
--	    for (j = 0; j < pPPriv->myfmt->num_attributes; j++) {
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     pPPriv->myfmt->attributes+j);
--	    }
--	}
--	
--	
--	/* hook in private data */
--	Private = xalloc(sizeof(DevUnion));
--	if (!Private)
--	    return FALSE;
--	memset(Private,0,sizeof(DevUnion));
--	Private->ptr = (pointer)pPPriv;
--	VAR[i]->pPortPrivates = Private;
--	VAR[i]->nPorts = 1;
--
--	/* init VideoAdaptorRec */
--	VAR[i]->type  = XvInputMask | XvWindowMask | XvVideoMask;
--	VAR[i]->name  = "video4linux";
--	VAR[i]->flags = VIDEO_INVERT_CLIPLIST;
--
--	VAR[i]->PutVideo = V4lPutVideo;
--	VAR[i]->PutStill = V4lPutStill;
--	VAR[i]->StopVideo = V4lStopVideo;
--	VAR[i]->SetPortAttribute = V4lSetPortAttribute;
--	VAR[i]->GetPortAttribute = V4lGetPortAttribute;
--	VAR[i]->QueryBestSize = V4lQueryBestSize;
--
--	VAR[i]->nEncodings = pPPriv->nenc;
--	VAR[i]->pEncodings = pPPriv->enc;
--	VAR[i]->nFormats =
--		sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
--	VAR[i]->pFormats = InputVideoFormats;
--
--	if (fd != -1)
--	    close(fd);
--	i++;
-+        sprintf(dev, "/dev/video%d", d);
-+        fd = open(dev, O_RDWR, 0);
-+        if (fd == -1) {
-+            sprintf(dev, "/dev/v4l/video%d", d);
-+            fd = open(dev, O_RDWR, 0);
-+            if (fd == -1)
-+                break;
-+        }
-+        DEBUG(xf86Msg(X_INFO,  "v4l: %s open ok\n",dev));
-+
-+        /* our private data */
-+        pPPriv = malloc(sizeof(PortPrivRec));
-+        if (!pPPriv)
-+            return FALSE;
-+        memset(pPPriv,0,sizeof(PortPrivRec));
-+        pPPriv->nr = d;
-+
-+        /* check device capabilities */
-+        memset(&pPPriv->cap, 0, sizeof(&pPPriv->cap));
-+        if (-1 == ioctl(fd, VIDIOC_QUERYCAP, &pPPriv->cap) ||
-+            0 == (pPPriv->cap.capabilities & V4L2_CAP_VIDEO_OVERLAY)) {
-+            xf86Msg(X_ERROR, "v4l: %s: no overlay support\n",dev);
-+            free(pPPriv);
-+            close(fd);
-+            continue;
-+        }
-+
-+        if (v4l_check_yuv(pScrn, pPPriv, dev, fd) == FALSE) {
-+                xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                               "Xv Overlay not supported. Can't use v4l driver\n");
-+                free(pPPriv);
-+                close(fd);
-+                continue;
-+        }
-+
-+        xf86Msg(X_INFO, "v4l: enabling overlay mode for %s.\n", dev);
-+        strncpy(V4L_NAME, dev, 16);
-+        V4LBuildEncodings(pPPriv, fd);
-+        if (NULL == pPPriv->enc)
-+            return FALSE;
-+
-+        /* alloc VideoAdaptorRec */
-+        VAR = realloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
-+        VAR[i] = malloc(sizeof(XF86VideoAdaptorRec));
-+        if (!VAR[i])
-+            return FALSE;
-+        memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
-+
-+        /* build attribute list */
-+        AddAllV4LControls(pPPriv, &VAR[i]->pAttributes, &VAR[i]->nAttributes, fd);
-+
-+        for (j = 0; j < V4L_ATTR; j++) {
-+            /* Other video attributes */
-+            v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                         &Attributes[j]);
-+        }
-+        if (pPPriv->cap.capabilities & V4L2_CAP_TUNER) {
-+            /* tuner attributes */
-+            v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                         &FreqAttr);
-+        }
-+
-+        /* Initialize yuv_format */
-+        if (0 != pPPriv->yuv_format) {
-+            /* pass throuth scaler attributes */
-+            for (j = 0; j < pPPriv->myfmt->num_attributes; j++) {
-+                v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                             pPPriv->myfmt->attributes+j);
-+            }
-+        }
-+
-+        DEBUG(xf86Msg(X_INFO, "v4l: saving config into driver data\n"));
-+        /* hook in private data */
-+        Private = malloc(sizeof(DevUnion));
-+        if (!Private)
-+            return FALSE;
-+        memset(Private,0,sizeof(DevUnion));
-+        Private->ptr = (pointer)pPPriv;
-+        VAR[i]->pPortPrivates = Private;
-+        VAR[i]->nPorts = 1;
-+
-+        /* init VideoAdaptorRec */
-+        VAR[i]->type  = XvInputMask | XvWindowMask | XvVideoMask;
-+        VAR[i]->name  = "video4linux";
-+        VAR[i]->flags = VIDEO_INVERT_CLIPLIST;
-+
-+        VAR[i]->PutVideo = V4lPutVideo;
-+        VAR[i]->PutStill = V4lPutStill;
-+        VAR[i]->StopVideo = V4lStopVideo;
-+        VAR[i]->SetPortAttribute = V4lSetPortAttribute;
-+        VAR[i]->GetPortAttribute = V4lGetPortAttribute;
-+        VAR[i]->QueryBestSize = V4lQueryBestSize;
-+
-+        VAR[i]->nEncodings = pPPriv->nenc;
-+        VAR[i]->pEncodings = pPPriv->enc;
-+        VAR[i]->nFormats = sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
-+        VAR[i]->pFormats = InputVideoFormats;
-+
-+        if (fd != -1) {
-+            DEBUG(xf86Msg(X_INFO,  "v4l: %s init finished.\n",dev));
-+            close(fd);
-+        }
-+        i++;
-     }
- 
-     xvEncoding   = MAKE_ATOM(XV_ENCODING);
--    xvHue        = MAKE_ATOM(XV_HUE);
--    xvSaturation = MAKE_ATOM(XV_SATURATION);
--    xvBrightness = MAKE_ATOM(XV_BRIGHTNESS);
--    xvContrast   = MAKE_ATOM(XV_CONTRAST);
--
-     xvFreq       = MAKE_ATOM(XV_FREQ);
--    xvMute       = MAKE_ATOM(XV_MUTE);
--    xvVolume     = MAKE_ATOM(XV_VOLUME);
- 
-     DEBUG(xf86Msg(X_INFO, "v4l: init done, %d device(s) found\n",i));
- 
-@@ -1024,10 +1248,43 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
- }
- 
- static Bool
-+V4LDetect(void)
-+{
-+    struct v4l2_capability cap;
-+    int fd, d, n = 0;
-+    char dev[18];
-+
-+    for (d = 0; d < MAX_V4L_DEVICES; d++) {
-+        sprintf(dev, "/dev/video%d", d);
-+        fd = open(dev, O_RDWR, 0);
-+        if (fd == -1) {
-+            sprintf(dev, "/dev/v4l/video%d", d);
-+            fd = open(dev, O_RDWR, 0);
-+            if (fd == -1)
-+                break;
-+        }
-+        close (fd);
-+        memset(&cap, 0, sizeof(cap));
-+        if (!ioctl(fd, VIDIOC_QUERYCAP, &cap) &&
-+            (cap.capabilities & V4L2_CAP_VIDEO_OVERLAY))
-+            n++;
-+    }
-+    xf86Msg(X_INFO, "v4l: %d video adapters with overlay support detected\n", n);
-+
-+    return (n > 0) ? TRUE : FALSE;
-+}
-+
-+static Bool
- V4LProbe(DriverPtr drv, int flags)
- {
--    if (flags & PROBE_DETECT)
--	return TRUE;
-+    /*
-+     * Don't try to register adapter at the detection phase, as Xv
-+     * extensions won't be there
-+     */
-+    if (flags == PROBE_DETECT)
-+        return V4LDetect();
-+
-+    DEBUG(xf86Msg(X_INFO, "v4l: Initiating device probe\n"));
- 
-     xf86XVRegisterGenericAdaptorDriver(V4LInit);
-     drv->refCount++;
-diff --git a/src/videodev.h b/src/videodev.h
-deleted file mode 100644
-index 3c9a7d8..0000000
---- a/src/videodev.h
-+++ /dev/null
-@@ -1,254 +0,0 @@
--#ifndef __LINUX_VIDEODEV_H
--#define __LINUX_VIDEODEV_H
--
--/* Linux V4L API, Version 1
-- * videodev.h from v4l driver in Linux 2.2.3 
-- *
-- * Used here with the explicit permission of the original author, Alan Cox.
-- *				<alan@lxorguk.ukuu.org.uk>
-- */
--
--#include <X11/Xmd.h>
--
--#define VID_TYPE_CAPTURE	1	/* Can capture */
--#define VID_TYPE_TUNER		2	/* Can tune */
--#define VID_TYPE_TELETEXT	4	/* Does teletext */
--#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
--#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
--#define VID_TYPE_CLIPPING	32	/* Can clip */
--#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
--#define VID_TYPE_SCALES		128	/* Scalable */
--#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
--#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
--
--struct video_capability
--{
--	char name[32];
--	int type;
--	int channels;	/* Num channels */
--	int audios;	/* Num audio devices */
--	int maxwidth;	/* Supported width */
--	int maxheight;	/* And height */
--	int minwidth;	/* Supported width */
--	int minheight;	/* And height */
--};
--
--
--struct video_channel
--{
--	int channel;
--	char name[32];
--	int tuners;
--	CARD32  flags;
--#define VIDEO_VC_TUNER		1	/* Channel has a tuner */
--#define VIDEO_VC_AUDIO		2	/* Channel has audio */
--	CARD16  type;
--#define VIDEO_TYPE_TV		1
--#define VIDEO_TYPE_CAMERA	2	
--	CARD16 norm;			/* Norm set by channel */
--};
--
--struct video_tuner
--{
--	int tuner;
--	char name[32];
--	unsigned long rangelow, rangehigh;	/* Tuner range */
--	CARD32 flags;
--#define VIDEO_TUNER_PAL		1
--#define VIDEO_TUNER_NTSC	2
--#define VIDEO_TUNER_SECAM	4
--#define VIDEO_TUNER_LOW		8	/* Uses KHz not MHz */
--#define VIDEO_TUNER_NORM	16	/* Tuner can set norm */
--#define VIDEO_TUNER_STEREO_ON	128	/* Tuner is seeing stereo */
--	CARD16 mode;			/* PAL/NTSC/SECAM/OTHER */
--#define VIDEO_MODE_PAL		0
--#define VIDEO_MODE_NTSC		1
--#define VIDEO_MODE_SECAM	2
--#define VIDEO_MODE_AUTO		3
--	CARD16 signal;			/* Signal strength 16bit scale */
--};
--
--struct video_picture
--{
--	CARD16	brightness;
--	CARD16	hue;
--	CARD16	colour;
--	CARD16	contrast;
--	CARD16	whiteness;	/* Black and white only */
--	CARD16	depth;		/* Capture depth */
--	CARD16   palette;	/* Palette in use */
--#define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
--#define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
--#define VIDEO_PALETTE_RGB565	3	/* 565 16 bit RGB */
--#define VIDEO_PALETTE_RGB24	4	/* 24bit RGB */
--#define VIDEO_PALETTE_RGB32	5	/* 32bit RGB */	
--#define VIDEO_PALETTE_RGB555	6	/* 555 15bit RGB */
--#define VIDEO_PALETTE_YUV422	7	/* YUV422 capture */
--#define VIDEO_PALETTE_YUYV	8
--#define VIDEO_PALETTE_UYVY	9	/* The great thing about standards is ... */
--#define VIDEO_PALETTE_YUV420	10
--#define VIDEO_PALETTE_YUV411	11	/* YUV411 capture */
--#define VIDEO_PALETTE_RAW	12	/* RAW capture (BT848) */
--#define VIDEO_PALETTE_YUV422P	13	/* YUV 4:2:2 Planar */
--#define VIDEO_PALETTE_YUV411P	14	/* YUV 4:1:1 Planar */
--#define VIDEO_PALETTE_YUV420P	15	/* YUV 4:2:0 Planar */
--#define VIDEO_PALETTE_YUV410P	16	/* YUV 4:1:0 Planar */
--#define VIDEO_PALETTE_PLANAR	13	/* start of planar entries */
--#define VIDEO_PALETTE_COMPONENT 7	/* start of component entries */
--};
--
--struct video_audio
--{
--	int	audio;		/* Audio channel */
--	CARD16	volume;		/* If settable */
--	CARD16	bass, treble;
--	CARD32	flags;
--#define VIDEO_AUDIO_MUTE	1
--#define VIDEO_AUDIO_MUTABLE	2
--#define VIDEO_AUDIO_VOLUME	4
--#define VIDEO_AUDIO_BASS	8
--#define VIDEO_AUDIO_TREBLE	16	
--	char    name[16];
--#define VIDEO_SOUND_MONO	1
--#define VIDEO_SOUND_STEREO	2
--#define VIDEO_SOUND_LANG1	4
--#define VIDEO_SOUND_LANG2	8
--        CARD16   mode;
--        CARD16	balance;	/* Stereo balance */
--        CARD16	step;		/* Step actual volume uses */
--};
--
--struct video_clip
--{
--	INT32	x,y;
--	INT32	width, height;
--	struct	video_clip *next;	/* For user use/driver use only */
--};
--
--struct video_window
--{
--	CARD32	x,y;			/* Position of window */
--	CARD32	width,height;		/* Its size */
--	CARD32	chromakey;
--	CARD32	flags;
--	struct	video_clip *clips;	/* Set only */
--	int	clipcount;
--#define VIDEO_WINDOW_INTERLACE	1
--#define VIDEO_CLIP_BITMAP	-1
--/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
--#define VIDEO_CLIPMAP_SIZE	(128 * 625)
--};
--
--struct video_capture
--{
--	CARD32 	x,y;			/* Offsets into image */
--	CARD32	width, height;		/* Area to capture */
--	CARD16	decimation;		/* Decimation divder */
--	CARD16	flags;			/* Flags for capture */
--#define VIDEO_CAPTURE_ODD		0	/* Temporal */
--#define VIDEO_CAPTURE_EVEN		1
--};
--
--struct video_buffer
--{
--	void	*base;
--	int	height,width;
--	int	depth;
--	int	bytesperline;
--};
--
--struct video_mmap
--{
--	unsigned	int frame;		/* Frame (0 - n) for double buffer */
--	int		height,width;
--	unsigned	int format;		/* should be VIDEO_PALETTE_* */
--};
--
--struct video_key
--{
--	CARD8	key[8];
--	CARD32	flags;
--};
--
--
--#define VIDEO_MAX_FRAME		32
--
--struct video_mbuf
--{
--	int	size;		/* Total memory to map */
--	int	frames;		/* Frames */
--	int	offsets[VIDEO_MAX_FRAME];
--};
--	
--
--#define 	VIDEO_NO_UNIT	(-1)
--
--	
--struct video_unit
--{
--	int 	video;		/* Video minor */
--	int	vbi;		/* VBI minor */
--	int	radio;		/* Radio minor */
--	int	audio;		/* Audio minor */
--	int	teletext;	/* Teletext minor */
--};
--
--#define VIDIOCGCAP		_IOR('v',1,struct video_capability)	/* Get capabilities */
--#define VIDIOCGCHAN		_IOWR('v',2,struct video_channel)	/* Get channel info (sources) */
--#define VIDIOCSCHAN		_IOW('v',3,struct video_channel)	/* Set channel 	*/
--#define VIDIOCGTUNER		_IOWR('v',4,struct video_tuner)		/* Get tuner abilities */
--#define VIDIOCSTUNER		_IOW('v',5,struct video_tuner)		/* Tune the tuner for the current channel */
--#define VIDIOCGPICT		_IOR('v',6,struct video_picture)	/* Get picture properties */
--#define VIDIOCSPICT		_IOW('v',7,struct video_picture)	/* Set picture properties */
--#define VIDIOCCAPTURE		_IOW('v',8,int)				/* Start, end capture */
--#define VIDIOCGWIN		_IOR('v',9, struct video_window)	/* Set the video overlay window */
--#define VIDIOCSWIN		_IOW('v',10, struct video_window)	/* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
--#define VIDIOCGFBUF		_IOR('v',11, struct video_buffer)	/* Get frame buffer */
--#define VIDIOCSFBUF		_IOW('v',12, struct video_buffer)	/* Set frame buffer - root only */
--#define VIDIOCKEY		_IOR('v',13, struct video_key)		/* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
--#define VIDIOCGFREQ		_IOR('v',14, unsigned long)		/* Set tuner */
--#define VIDIOCSFREQ		_IOW('v',15, unsigned long)		/* Set tuner */
--#define VIDIOCGAUDIO		_IOR('v',16, struct video_audio)	/* Get audio info */
--#define VIDIOCSAUDIO		_IOW('v',17, struct video_audio)	/* Audio source, mute etc */
--#define VIDIOCSYNC		_IOW('v',18, int)			/* Sync with mmap grabbing */
--#define VIDIOCMCAPTURE		_IOW('v',19, struct video_mmap)		/* Grab frames */
--#define VIDIOCGMBUF		_IOR('v', 20, struct video_mbuf)	/* Memory map buffer info */
--#define VIDIOCGUNIT		_IOR('v', 21, struct video_unit)	/* Get attached units */
--#define VIDIOCGCAPTURE		_IOR('v',22, struct video_capture)	/* Get frame buffer */
--#define VIDIOCSCAPTURE		_IOW('v',23, struct video_capture)	/* Set frame buffer - root only */
--
--#define BASE_VIDIOCPRIVATE	192		/* 192-255 are private */
--
--
--#define VID_HARDWARE_BT848	1
--#define VID_HARDWARE_QCAM_BW	2
--#define VID_HARDWARE_PMS	3
--#define VID_HARDWARE_QCAM_C	4
--#define VID_HARDWARE_PSEUDO	5
--#define VID_HARDWARE_SAA5249	6
--#define VID_HARDWARE_AZTECH	7
--#define VID_HARDWARE_SF16MI	8
--#define VID_HARDWARE_RTRACK	9
--#define VID_HARDWARE_ZOLTRIX	10
--#define VID_HARDWARE_SAA7146    11
--#define VID_HARDWARE_VIDEUM	12	/* Reserved for Winnov videum */
--#define VID_HARDWARE_RTRACK2	13
--#define VID_HARDWARE_PERMEDIA2	14	/* Reserved for Permedia2 */
--#define VID_HARDWARE_RIVA128	15	/* Reserved for RIVA 128 */
--#define VID_HARDWARE_PLANB	16	/* PowerMac motherboard video-in */
--#define VID_HARDWARE_BROADWAY	17	/* Broadway project */
--#define VID_HARDWARE_GEMTEK	18
--#define VID_HARDWARE_TYPHOON	19
--#define VID_HARDWARE_VINO	20	/* Reserved for SGI Indy Vino */
--
--/*
-- *	Initialiser list
-- */
-- 
--struct video_init
--{
--	char *name;
--	int (*init)(struct video_init *);
--};
--
--#endif
-diff --git a/src/videodev2.h b/src/videodev2.h
-new file mode 100644
-index 0000000..bf6dde2
---- /dev/null
-+++ b/src/videodev2.h
-@@ -0,0 +1,1929 @@
-+/*
-+ *  Video for Linux Two header file
-+ *
-+ *  Copyright (C) 1999-2007 the contributors
-+ *
-+ *  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.
-+ *
-+ *  Alternatively you can redistribute this file under the terms of the
-+ *  BSD license as stated below:
-+ *
-+ *  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 names of its contributors may not be used to endorse or promote
-+ *     products derived from this software without specific prior written
-+ *     permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *	Header file for v4l or V4L2 drivers and applications
-+ * with public API.
-+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
-+ * no #if __KERNEL tests are allowed here
-+ *
-+ *	See http://linuxtv.org for more info
-+ *
-+ *	Author: Bill Dirks <bill@thedirks.org>
-+ *		Justin Schoeman
-+ *              Hans Verkuil <hverkuil@xs4all.nl>
-+ *		et al.
-+ */
-+#ifndef __LINUX_VIDEODEV2_H
-+#define __LINUX_VIDEODEV2_H
-+
-+#include <linux/ioctl.h>
-+#include <linux/types.h>
-+#include <sys/time.h>
-+
-+/*
-+ * Common stuff for both V4L1 and V4L2
-+ * Moved from videodev.h
-+ */
-+#define VIDEO_MAX_FRAME               32
-+#define VIDEO_MAX_PLANES               8
-+
-+/* These defines are V4L1 specific and should not be used with the V4L2 API!
-+   They will be removed from this header in the future. */
-+
-+#define VID_TYPE_CAPTURE	1	/* Can capture */
-+#define VID_TYPE_TUNER		2	/* Can tune */
-+#define VID_TYPE_TELETEXT	4	/* Does teletext */
-+#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
-+#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
-+#define VID_TYPE_CLIPPING	32	/* Can clip */
-+#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
-+#define VID_TYPE_SCALES		128	/* Scalable */
-+#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
-+#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
-+#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
-+#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
-+#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
-+#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
-+
-+/*
-+ *	M I S C E L L A N E O U S
-+ */
-+
-+/*  Four-character-code (FOURCC) */
-+#define v4l2_fourcc(a, b, c, d)\
-+	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
-+
-+/*
-+ *	E N U M S
-+ */
-+enum v4l2_field {
-+	V4L2_FIELD_ANY           = 0, /* driver can choose from none,
-+					 top, bottom, interlaced
-+					 depending on whatever it thinks
-+					 is approximate ... */
-+	V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
-+	V4L2_FIELD_TOP           = 2, /* top field only */
-+	V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
-+	V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
-+	V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
-+					 buffer, top-bottom order */
-+	V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
-+	V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
-+					 separate buffers */
-+	V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
-+					 first and the top field is
-+					 transmitted first */
-+	V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
-+					 first and the bottom field is
-+					 transmitted first */
-+};
-+#define V4L2_FIELD_HAS_TOP(field)	\
-+	((field) == V4L2_FIELD_TOP 	||\
-+	 (field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB	||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTTOM(field)	\
-+	((field) == V4L2_FIELD_BOTTOM 	||\
-+	 (field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB	||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTH(field)	\
-+	((field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB ||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+
-+enum v4l2_buf_type {
-+	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
-+	V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
-+	V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
-+	V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
-+	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
-+	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
-+#if 1
-+	/* Experimental */
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
-+#endif
-+	V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
-+	V4L2_BUF_TYPE_PRIVATE              = 0x80,
-+};
-+
-+#define V4L2_TYPE_IS_MULTIPLANAR(type)			\
-+	((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE	\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-+
-+#define V4L2_TYPE_IS_OUTPUT(type)				\
-+	((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT			\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE		\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY		\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY	\
-+	 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT			\
-+	 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
-+
-+enum v4l2_tuner_type {
-+	V4L2_TUNER_RADIO	     = 1,
-+	V4L2_TUNER_ANALOG_TV	     = 2,
-+	V4L2_TUNER_DIGITAL_TV	     = 3,
-+};
-+
-+enum v4l2_memory {
-+	V4L2_MEMORY_MMAP             = 1,
-+	V4L2_MEMORY_USERPTR          = 2,
-+	V4L2_MEMORY_OVERLAY          = 3,
-+};
-+
-+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
-+enum v4l2_colorspace {
-+	/* ITU-R 601 -- broadcast NTSC/PAL */
-+	V4L2_COLORSPACE_SMPTE170M     = 1,
-+
-+	/* 1125-Line (US) HDTV */
-+	V4L2_COLORSPACE_SMPTE240M     = 2,
-+
-+	/* HD and modern captures. */
-+	V4L2_COLORSPACE_REC709        = 3,
-+
-+	/* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
-+	V4L2_COLORSPACE_BT878         = 4,
-+
-+	/* These should be useful.  Assume 601 extents. */
-+	V4L2_COLORSPACE_470_SYSTEM_M  = 5,
-+	V4L2_COLORSPACE_470_SYSTEM_BG = 6,
-+
-+	/* I know there will be cameras that send this.  So, this is
-+	 * unspecified chromaticities and full 0-255 on each of the
-+	 * Y'CbCr components
-+	 */
-+	V4L2_COLORSPACE_JPEG          = 7,
-+
-+	/* For RGB colourspaces, this is probably a good start. */
-+	V4L2_COLORSPACE_SRGB          = 8,
-+};
-+
-+enum v4l2_priority {
-+	V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
-+	V4L2_PRIORITY_BACKGROUND  = 1,
-+	V4L2_PRIORITY_INTERACTIVE = 2,
-+	V4L2_PRIORITY_RECORD      = 3,
-+	V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
-+};
-+
-+struct v4l2_rect {
-+	__s32   left;
-+	__s32   top;
-+	__s32   width;
-+	__s32   height;
-+};
-+
-+struct v4l2_fract {
-+	__u32   numerator;
-+	__u32   denominator;
-+};
-+
-+/*
-+ *	D R I V E R   C A P A B I L I T I E S
-+ */
-+struct v4l2_capability {
-+	__u8	driver[16];	/* i.e. "bttv" */
-+	__u8	card[32];	/* i.e. "Hauppauge WinTV" */
-+	__u8	bus_info[32];	/* "PCI:" + pci_name(pci_dev) */
-+	__u32   version;        /* should use KERNEL_VERSION() */
-+	__u32	capabilities;	/* Device capabilities */
-+	__u32	reserved[4];
-+};
-+
-+/* Values for 'capabilities' field */
-+#define V4L2_CAP_VIDEO_CAPTURE		0x00000001  /* Is a video capture device */
-+#define V4L2_CAP_VIDEO_OUTPUT		0x00000002  /* Is a video output device */
-+#define V4L2_CAP_VIDEO_OVERLAY		0x00000004  /* Can do video overlay */
-+#define V4L2_CAP_VBI_CAPTURE		0x00000010  /* Is a raw VBI capture device */
-+#define V4L2_CAP_VBI_OUTPUT		0x00000020  /* Is a raw VBI output device */
-+#define V4L2_CAP_SLICED_VBI_CAPTURE	0x00000040  /* Is a sliced VBI capture device */
-+#define V4L2_CAP_SLICED_VBI_OUTPUT	0x00000080  /* Is a sliced VBI output device */
-+#define V4L2_CAP_RDS_CAPTURE		0x00000100  /* RDS data capture */
-+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000200  /* Can do video output overlay */
-+#define V4L2_CAP_HW_FREQ_SEEK		0x00000400  /* Can do hardware frequency seek  */
-+#define V4L2_CAP_RDS_OUTPUT		0x00000800  /* Is an RDS encoder */
-+
-+/* Is a video capture device that supports multiplanar formats */
-+#define V4L2_CAP_VIDEO_CAPTURE_MPLANE	0x00001000
-+/* Is a video output device that supports multiplanar formats */
-+#define V4L2_CAP_VIDEO_OUTPUT_MPLANE	0x00002000
-+
-+#define V4L2_CAP_TUNER			0x00010000  /* has a tuner */
-+#define V4L2_CAP_AUDIO			0x00020000  /* has audio support */
-+#define V4L2_CAP_RADIO			0x00040000  /* is a radio device */
-+#define V4L2_CAP_MODULATOR		0x00080000  /* has a modulator */
-+
-+#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
-+#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
-+#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
-+
-+/*
-+ *	V I D E O   I M A G E   F O R M A T
-+ */
-+struct v4l2_pix_format {
-+	__u32         		width;
-+	__u32			height;
-+	__u32			pixelformat;
-+	enum v4l2_field  	field;
-+	__u32            	bytesperline;	/* for padding, zero if unused */
-+	__u32          		sizeimage;
-+	enum v4l2_colorspace	colorspace;
-+	__u32			priv;		/* private data, depends on pixelformat */
-+};
-+
-+/*      Pixel format         FOURCC                          depth  Description  */
-+
-+/* RGB formats */
-+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
-+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
-+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
-+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
-+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
-+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
-+#define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6	  */
-+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
-+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
-+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
-+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
-+
-+/* Grey formats */
-+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
-+#define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
-+#define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
-+#define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
-+#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
-+
-+/* Palette formats */
-+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
-+
-+/* Luminance+Chrominance formats */
-+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
-+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
-+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
-+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
-+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
-+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
-+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
-+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
-+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
-+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
-+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
-+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
-+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
-+#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
-+
-+/* two planes -- one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
-+#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
-+#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
-+
-+/* two non contiguous planes - one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 macroblocks */
-+
-+/* three non contiguous planes - Y, Cb, Cr */
-+#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
-+
-+/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
-+#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
-+#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
-+#define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
-+#define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
-+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10  BGBG.. GRGR.. */
-+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
-+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
-+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
-+	/* 10bit raw bayer DPCM compressed to 8 bits */
-+#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
-+	/*
-+	 * 10bit raw bayer, expanded to 16 bits
-+	 * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
-+	 */
-+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
-+
-+/* compressed formats */
-+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
-+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
-+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
-+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4    */
-+
-+/*  Vendor-specific formats   */
-+#define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
-+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
-+#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
-+#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
-+#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
-+#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
-+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
-+#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
-+#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
-+#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
-+#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
-+#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
-+#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
-+#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */
-+#define V4L2_PIX_FMT_SQ905C   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
-+#define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
-+#define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
-+#define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
-+#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
-+#define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
-+#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
-+#define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
-+
-+/*
-+ *	F O R M A T   E N U M E R A T I O N
-+ */
-+struct v4l2_fmtdesc {
-+	__u32		    index;             /* Format number      */
-+	enum v4l2_buf_type  type;              /* buffer type        */
-+	__u32               flags;
-+	__u8		    description[32];   /* Description string */
-+	__u32		    pixelformat;       /* Format fourcc      */
-+	__u32		    reserved[4];
-+};
-+
-+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-+#define V4L2_FMT_FLAG_EMULATED   0x0002
-+
-+#if 1
-+	/* Experimental Frame Size and frame rate enumeration */
-+/*
-+ *	F R A M E   S I Z E   E N U M E R A T I O N
-+ */
-+enum v4l2_frmsizetypes {
-+	V4L2_FRMSIZE_TYPE_DISCRETE	= 1,
-+	V4L2_FRMSIZE_TYPE_CONTINUOUS	= 2,
-+	V4L2_FRMSIZE_TYPE_STEPWISE	= 3,
-+};
-+
-+struct v4l2_frmsize_discrete {
-+	__u32			width;		/* Frame width [pixel] */
-+	__u32			height;		/* Frame height [pixel] */
-+};
-+
-+struct v4l2_frmsize_stepwise {
-+	__u32			min_width;	/* Minimum frame width [pixel] */
-+	__u32			max_width;	/* Maximum frame width [pixel] */
-+	__u32			step_width;	/* Frame width step size [pixel] */
-+	__u32			min_height;	/* Minimum frame height [pixel] */
-+	__u32			max_height;	/* Maximum frame height [pixel] */
-+	__u32			step_height;	/* Frame height step size [pixel] */
-+};
-+
-+struct v4l2_frmsizeenum {
-+	__u32			index;		/* Frame size number */
-+	__u32			pixel_format;	/* Pixel format */
-+	__u32			type;		/* Frame size type the device supports. */
-+
-+	union {					/* Frame size */
-+		struct v4l2_frmsize_discrete	discrete;
-+		struct v4l2_frmsize_stepwise	stepwise;
-+	};
-+
-+	__u32   reserved[2];			/* Reserved space for future use */
-+};
-+
-+/*
-+ *	F R A M E   R A T E   E N U M E R A T I O N
-+ */
-+enum v4l2_frmivaltypes {
-+	V4L2_FRMIVAL_TYPE_DISCRETE	= 1,
-+	V4L2_FRMIVAL_TYPE_CONTINUOUS	= 2,
-+	V4L2_FRMIVAL_TYPE_STEPWISE	= 3,
-+};
-+
-+struct v4l2_frmival_stepwise {
-+	struct v4l2_fract	min;		/* Minimum frame interval [s] */
-+	struct v4l2_fract	max;		/* Maximum frame interval [s] */
-+	struct v4l2_fract	step;		/* Frame interval step size [s] */
-+};
-+
-+struct v4l2_frmivalenum {
-+	__u32			index;		/* Frame format index */
-+	__u32			pixel_format;	/* Pixel format */
-+	__u32			width;		/* Frame width */
-+	__u32			height;		/* Frame height */
-+	__u32			type;		/* Frame interval type the device supports. */
-+
-+	union {					/* Frame interval */
-+		struct v4l2_fract		discrete;
-+		struct v4l2_frmival_stepwise	stepwise;
-+	};
-+
-+	__u32	reserved[2];			/* Reserved space for future use */
-+};
-+#endif
-+
-+/*
-+ *	T I M E C O D E
-+ */
-+struct v4l2_timecode {
-+	__u32	type;
-+	__u32	flags;
-+	__u8	frames;
-+	__u8	seconds;
-+	__u8	minutes;
-+	__u8	hours;
-+	__u8	userbits[4];
-+};
-+
-+/*  Type  */
-+#define V4L2_TC_TYPE_24FPS		1
-+#define V4L2_TC_TYPE_25FPS		2
-+#define V4L2_TC_TYPE_30FPS		3
-+#define V4L2_TC_TYPE_50FPS		4
-+#define V4L2_TC_TYPE_60FPS		5
-+
-+/*  Flags  */
-+#define V4L2_TC_FLAG_DROPFRAME		0x0001 /* "drop-frame" mode */
-+#define V4L2_TC_FLAG_COLORFRAME		0x0002
-+#define V4L2_TC_USERBITS_field		0x000C
-+#define V4L2_TC_USERBITS_USERDEFINED	0x0000
-+#define V4L2_TC_USERBITS_8BITCHARS	0x0008
-+/* The above is based on SMPTE timecodes */
-+
-+struct v4l2_jpegcompression {
-+	int quality;
-+
-+	int  APPn;              /* Number of APP segment to be written,
-+				 * must be 0..15 */
-+	int  APP_len;           /* Length of data in JPEG APPn segment */
-+	char APP_data[60];      /* Data in the JPEG APPn segment. */
-+
-+	int  COM_len;           /* Length of data in JPEG COM segment */
-+	char COM_data[60];      /* Data in JPEG COM segment */
-+
-+	__u32 jpeg_markers;     /* Which markers should go into the JPEG
-+				 * output. Unless you exactly know what
-+				 * you do, leave them untouched.
-+				 * Inluding less markers will make the
-+				 * resulting code smaller, but there will
-+				 * be fewer applications which can read it.
-+				 * The presence of the APP and COM marker
-+				 * is influenced by APP_len and COM_len
-+				 * ONLY, not by this property! */
-+
-+#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
-+#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
-+#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
-+#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
-+#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-+					* allways use APP0 */
-+};
-+
-+/*
-+ *	M E M O R Y - M A P P I N G   B U F F E R S
-+ */
-+struct v4l2_requestbuffers {
-+	__u32			count;
-+	enum v4l2_buf_type      type;
-+	enum v4l2_memory        memory;
-+	__u32			reserved[2];
-+};
-+
-+/**
-+ * struct v4l2_plane - plane info for multi-planar buffers
-+ * @bytesused:		number of bytes occupied by data in the plane (payload)
-+ * @length:		size of this plane (NOT the payload) in bytes
-+ * @mem_offset:		when memory in the associated struct v4l2_buffer is
-+ *			V4L2_MEMORY_MMAP, equals the offset from the start of
-+ *			the device memory for this plane (or is a "cookie" that
-+ *			should be passed to mmap() called on the video node)
-+ * @userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
-+ *			pointing to this plane
-+ * @data_offset:	offset in the plane to the start of data; usually 0,
-+ *			unless there is a header in front of the data
-+ *
-+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
-+ * with two planes can have one plane for Y, and another for interleaved CbCr
-+ * components. Each plane can reside in a separate memory buffer, or even in
-+ * a completely separate memory node (e.g. in embedded devices).
-+ */
-+struct v4l2_plane {
-+	__u32			bytesused;
-+	__u32			length;
-+	union {
-+		__u32		mem_offset;
-+		unsigned long	userptr;
-+	} m;
-+	__u32			data_offset;
-+	__u32			reserved[11];
-+};
-+
-+/**
-+ * struct v4l2_buffer - video buffer info
-+ * @index:	id number of the buffer
-+ * @type:	buffer type (type == *_MPLANE for multiplanar buffers)
-+ * @bytesused:	number of bytes occupied by data in the buffer (payload);
-+ *		unused (set to 0) for multiplanar buffers
-+ * @flags:	buffer informational flags
-+ * @field:	field order of the image in the buffer
-+ * @timestamp:	frame timestamp
-+ * @timecode:	frame timecode
-+ * @sequence:	sequence count of this frame
-+ * @memory:	the method, in which the actual video data is passed
-+ * @offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
-+ *		offset from the start of the device memory for this plane,
-+ *		(or a "cookie" that should be passed to mmap() as offset)
-+ * @userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
-+ *		a userspace pointer pointing to this buffer
-+ * @planes:	for multiplanar buffers; userspace pointer to the array of plane
-+ *		info structs for this buffer
-+ * @length:	size in bytes of the buffer (NOT its payload) for single-plane
-+ *		buffers (when type != *_MPLANE); number of elements in the
-+ *		planes array for multi-plane buffers
-+ * @input:	input number from which the video data has has been captured
-+ *
-+ * Contains data exchanged by application and driver using one of the Streaming
-+ * I/O methods.
-+ */
-+struct v4l2_buffer {
-+	__u32			index;
-+	enum v4l2_buf_type      type;
-+	__u32			bytesused;
-+	__u32			flags;
-+	enum v4l2_field		field;
-+	struct timeval		timestamp;
-+	struct v4l2_timecode	timecode;
-+	__u32			sequence;
-+
-+	/* memory location */
-+	enum v4l2_memory        memory;
-+	union {
-+		__u32           offset;
-+		unsigned long   userptr;
-+		struct v4l2_plane *planes;
-+	} m;
-+	__u32			length;
-+	__u32			input;
-+	__u32			reserved;
-+};
-+
-+/*  Flags for 'flags' field */
-+#define V4L2_BUF_FLAG_MAPPED	0x0001  /* Buffer is mapped (flag) */
-+#define V4L2_BUF_FLAG_QUEUED	0x0002	/* Buffer is queued for processing */
-+#define V4L2_BUF_FLAG_DONE	0x0004	/* Buffer is ready */
-+#define V4L2_BUF_FLAG_KEYFRAME	0x0008	/* Image is a keyframe (I-frame) */
-+#define V4L2_BUF_FLAG_PFRAME	0x0010	/* Image is a P-frame */
-+#define V4L2_BUF_FLAG_BFRAME	0x0020	/* Image is a B-frame */
-+/* Buffer is ready, but the data contained within is corrupted. */
-+#define V4L2_BUF_FLAG_ERROR	0x0040
-+#define V4L2_BUF_FLAG_TIMECODE	0x0100	/* timecode field is valid */
-+#define V4L2_BUF_FLAG_INPUT     0x0200  /* input field is valid */
-+
-+/*
-+ *	O V E R L A Y   P R E V I E W
-+ */
-+struct v4l2_framebuffer {
-+	__u32			capability;
-+	__u32			flags;
-+/* FIXME: in theory we should pass something like PCI device + memory
-+ * region + offset instead of some physical address */
-+	void                    *base;
-+	struct v4l2_pix_format	fmt;
-+};
-+/*  Flags for the 'capability' field. Read only */
-+#define V4L2_FBUF_CAP_EXTERNOVERLAY	0x0001
-+#define V4L2_FBUF_CAP_CHROMAKEY		0x0002
-+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-+#define V4L2_FBUF_CAP_BITMAP_CLIPPING	0x0008
-+#define V4L2_FBUF_CAP_LOCAL_ALPHA	0x0010
-+#define V4L2_FBUF_CAP_GLOBAL_ALPHA	0x0020
-+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA	0x0040
-+#define V4L2_FBUF_CAP_SRC_CHROMAKEY	0x0080
-+/*  Flags for the 'flags' field. */
-+#define V4L2_FBUF_FLAG_PRIMARY		0x0001
-+#define V4L2_FBUF_FLAG_OVERLAY		0x0002
-+#define V4L2_FBUF_FLAG_CHROMAKEY	0x0004
-+#define V4L2_FBUF_FLAG_LOCAL_ALPHA	0x0008
-+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA	0x0010
-+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA	0x0020
-+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY	0x0040
-+
-+struct v4l2_clip {
-+	struct v4l2_rect        c;
-+	struct v4l2_clip	*next;
-+};
-+
-+struct v4l2_window {
-+	struct v4l2_rect        w;
-+	enum v4l2_field  	field;
-+	__u32			chromakey;
-+	struct v4l2_clip	*clips;
-+	__u32			clipcount;
-+	void			*bitmap;
-+	__u8                    global_alpha;
-+};
-+
-+/*
-+ *	C A P T U R E   P A R A M E T E R S
-+ */
-+struct v4l2_captureparm {
-+	__u32		   capability;	  /*  Supported modes */
-+	__u32		   capturemode;	  /*  Current mode */
-+	struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
-+	__u32		   extendedmode;  /*  Driver-specific extensions */
-+	__u32              readbuffers;   /*  # of buffers for read */
-+	__u32		   reserved[4];
-+};
-+
-+/*  Flags for 'capability' and 'capturemode' fields */
-+#define V4L2_MODE_HIGHQUALITY	0x0001	/*  High quality imaging mode */
-+#define V4L2_CAP_TIMEPERFRAME	0x1000	/*  timeperframe field is supported */
-+
-+struct v4l2_outputparm {
-+	__u32		   capability;	 /*  Supported modes */
-+	__u32		   outputmode;	 /*  Current mode */
-+	struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
-+	__u32		   extendedmode; /*  Driver-specific extensions */
-+	__u32              writebuffers; /*  # of buffers for write */
-+	__u32		   reserved[4];
-+};
-+
-+/*
-+ *	I N P U T   I M A G E   C R O P P I N G
-+ */
-+struct v4l2_cropcap {
-+	enum v4l2_buf_type      type;
-+	struct v4l2_rect        bounds;
-+	struct v4l2_rect        defrect;
-+	struct v4l2_fract       pixelaspect;
-+};
-+
-+struct v4l2_crop {
-+	enum v4l2_buf_type      type;
-+	struct v4l2_rect        c;
-+};
-+
-+/*
-+ *      A N A L O G   V I D E O   S T A N D A R D
-+ */
-+
-+typedef __u64 v4l2_std_id;
-+
-+/* one bit for each */
-+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
-+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
-+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
-+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
-+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
-+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
-+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
-+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
-+
-+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
-+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
-+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
-+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
-+
-+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
-+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
-+#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
-+#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)
-+
-+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
-+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
-+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
-+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
-+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
-+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
-+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
-+#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
-+
-+/* ATSC/HDTV */
-+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
-+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
-+
-+/* FIXME:
-+   Although std_id is 64 bits, there is an issue on PPC32 architecture that
-+   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
-+   this value to 32 bits.
-+   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
-+   it should work fine. However, if needed to add more than two standards,
-+   v4l2-common.c should be fixed.
-+ */
-+
-+/* some merged standards */
-+#define V4L2_STD_MN	(V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
-+#define V4L2_STD_B	(V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
-+#define V4L2_STD_GH	(V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
-+#define V4L2_STD_DK	(V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
-+
-+/* some common needed stuff */
-+#define V4L2_STD_PAL_BG		(V4L2_STD_PAL_B		|\
-+				 V4L2_STD_PAL_B1	|\
-+				 V4L2_STD_PAL_G)
-+#define V4L2_STD_PAL_DK		(V4L2_STD_PAL_D		|\
-+				 V4L2_STD_PAL_D1	|\
-+				 V4L2_STD_PAL_K)
-+#define V4L2_STD_PAL		(V4L2_STD_PAL_BG	|\
-+				 V4L2_STD_PAL_DK	|\
-+				 V4L2_STD_PAL_H		|\
-+				 V4L2_STD_PAL_I)
-+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M	|\
-+				 V4L2_STD_NTSC_M_JP     |\
-+				 V4L2_STD_NTSC_M_KR)
-+#define V4L2_STD_SECAM_DK      	(V4L2_STD_SECAM_D	|\
-+				 V4L2_STD_SECAM_K	|\
-+				 V4L2_STD_SECAM_K1)
-+#define V4L2_STD_SECAM		(V4L2_STD_SECAM_B	|\
-+				 V4L2_STD_SECAM_G	|\
-+				 V4L2_STD_SECAM_H	|\
-+				 V4L2_STD_SECAM_DK	|\
-+				 V4L2_STD_SECAM_L       |\
-+				 V4L2_STD_SECAM_LC)
-+
-+#define V4L2_STD_525_60		(V4L2_STD_PAL_M		|\
-+				 V4L2_STD_PAL_60	|\
-+				 V4L2_STD_NTSC		|\
-+				 V4L2_STD_NTSC_443)
-+#define V4L2_STD_625_50		(V4L2_STD_PAL		|\
-+				 V4L2_STD_PAL_N		|\
-+				 V4L2_STD_PAL_Nc	|\
-+				 V4L2_STD_SECAM)
-+#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
-+				 V4L2_STD_ATSC_16_VSB)
-+
-+#define V4L2_STD_UNKNOWN        0
-+#define V4L2_STD_ALL            (V4L2_STD_525_60	|\
-+				 V4L2_STD_625_50)
-+
-+struct v4l2_standard {
-+	__u32		     index;
-+	v4l2_std_id          id;
-+	__u8		     name[24];
-+	struct v4l2_fract    frameperiod; /* Frames, not fields */
-+	__u32		     framelines;
-+	__u32		     reserved[4];
-+};
-+
-+/*
-+ *	V I D E O	T I M I N G S	D V	P R E S E T
-+ */
-+struct v4l2_dv_preset {
-+	__u32	preset;
-+	__u32	reserved[4];
-+};
-+
-+/*
-+ *	D V	P R E S E T S	E N U M E R A T I O N
-+ */
-+struct v4l2_dv_enum_preset {
-+	__u32	index;
-+	__u32	preset;
-+	__u8	name[32]; /* Name of the preset timing */
-+	__u32	width;
-+	__u32	height;
-+	__u32	reserved[4];
-+};
-+
-+/*
-+ * 	D V	P R E S E T	V A L U E S
-+ */
-+#define		V4L2_DV_INVALID		0
-+#define		V4L2_DV_480P59_94	1 /* BT.1362 */
-+#define		V4L2_DV_576P50		2 /* BT.1362 */
-+#define		V4L2_DV_720P24		3 /* SMPTE 296M */
-+#define		V4L2_DV_720P25		4 /* SMPTE 296M */
-+#define		V4L2_DV_720P30		5 /* SMPTE 296M */
-+#define		V4L2_DV_720P50		6 /* SMPTE 296M */
-+#define		V4L2_DV_720P59_94	7 /* SMPTE 274M */
-+#define		V4L2_DV_720P60		8 /* SMPTE 274M/296M */
-+#define		V4L2_DV_1080I29_97	9 /* BT.1120/ SMPTE 274M */
-+#define		V4L2_DV_1080I30		10 /* BT.1120/ SMPTE 274M */
-+#define		V4L2_DV_1080I25		11 /* BT.1120 */
-+#define		V4L2_DV_1080I50		12 /* SMPTE 296M */
-+#define		V4L2_DV_1080I60		13 /* SMPTE 296M */
-+#define		V4L2_DV_1080P24		14 /* SMPTE 296M */
-+#define		V4L2_DV_1080P25		15 /* SMPTE 296M */
-+#define		V4L2_DV_1080P30		16 /* SMPTE 296M */
-+#define		V4L2_DV_1080P50		17 /* BT.1120 */
-+#define		V4L2_DV_1080P60		18 /* BT.1120 */
-+
-+/*
-+ *	D V 	B T	T I M I N G S
-+ */
-+
-+/* BT.656/BT.1120 timing data */
-+struct v4l2_bt_timings {
-+	__u32	width;		/* width in pixels */
-+	__u32	height;		/* height in lines */
-+	__u32	interlaced;	/* Interlaced or progressive */
-+	__u32	polarities;	/* Positive or negative polarity */
-+	__u64	pixelclock;	/* Pixel clock in HZ. Ex. 74.25MHz->74250000 */
-+	__u32	hfrontporch;	/* Horizpontal front porch in pixels */
-+	__u32	hsync;		/* Horizontal Sync length in pixels */
-+	__u32	hbackporch;	/* Horizontal back porch in pixels */
-+	__u32	vfrontporch;	/* Vertical front porch in pixels */
-+	__u32	vsync;		/* Vertical Sync length in lines */
-+	__u32	vbackporch;	/* Vertical back porch in lines */
-+	__u32	il_vfrontporch;	/* Vertical front porch for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	il_vsync;	/* Vertical sync length for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	il_vbackporch;	/* Vertical back porch for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	reserved[16];
-+} __attribute__ ((packed));
-+
-+/* Interlaced or progressive format */
-+#define	V4L2_DV_PROGRESSIVE	0
-+#define	V4L2_DV_INTERLACED	1
-+
-+/* Polarities. If bit is not set, it is assumed to be negative polarity */
-+#define V4L2_DV_VSYNC_POS_POL	0x00000001
-+#define V4L2_DV_HSYNC_POS_POL	0x00000002
-+
-+
-+/* DV timings */
-+struct v4l2_dv_timings {
-+	__u32 type;
-+	union {
-+		struct v4l2_bt_timings	bt;
-+		__u32	reserved[32];
-+	};
-+} __attribute__ ((packed));
-+
-+/* Values for the type field */
-+#define V4L2_DV_BT_656_1120	0	/* BT.656/1120 timing type */
-+
-+/*
-+ *	V I D E O   I N P U T S
-+ */
-+struct v4l2_input {
-+	__u32	     index;		/*  Which input */
-+	__u8	     name[32];		/*  Label */
-+	__u32	     type;		/*  Type of input */
-+	__u32	     audioset;		/*  Associated audios (bitfield) */
-+	__u32        tuner;             /*  Associated tuner */
-+	v4l2_std_id  std;
-+	__u32	     status;
-+	__u32	     capabilities;
-+	__u32	     reserved[3];
-+};
-+
-+/*  Values for the 'type' field */
-+#define V4L2_INPUT_TYPE_TUNER		1
-+#define V4L2_INPUT_TYPE_CAMERA		2
-+
-+/* field 'status' - general */
-+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
-+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
-+#define V4L2_IN_ST_NO_COLOR    0x00000004
-+
-+/* field 'status' - sensor orientation */
-+/* If sensor is mounted upside down set both bits */
-+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
-+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
-+
-+/* field 'status' - analog */
-+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
-+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
-+
-+/* field 'status' - digital */
-+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
-+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
-+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
-+
-+/* field 'status' - VCR and set-top box */
-+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
-+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
-+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
-+
-+/* capabilities flags */
-+#define V4L2_IN_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */
-+#define V4L2_IN_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */
-+#define V4L2_IN_CAP_STD			0x00000004 /* Supports S_STD */
-+
-+/*
-+ *	V I D E O   O U T P U T S
-+ */
-+struct v4l2_output {
-+	__u32	     index;		/*  Which output */
-+	__u8	     name[32];		/*  Label */
-+	__u32	     type;		/*  Type of output */
-+	__u32	     audioset;		/*  Associated audios (bitfield) */
-+	__u32	     modulator;         /*  Associated modulator */
-+	v4l2_std_id  std;
-+	__u32	     capabilities;
-+	__u32	     reserved[3];
-+};
-+/*  Values for the 'type' field */
-+#define V4L2_OUTPUT_TYPE_MODULATOR		1
-+#define V4L2_OUTPUT_TYPE_ANALOG			2
-+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY	3
-+
-+/* capabilities flags */
-+#define V4L2_OUT_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */
-+#define V4L2_OUT_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */
-+#define V4L2_OUT_CAP_STD		0x00000004 /* Supports S_STD */
-+
-+/*
-+ *	C O N T R O L S
-+ */
-+struct v4l2_control {
-+	__u32		     id;
-+	__s32		     value;
-+};
-+
-+struct v4l2_ext_control {
-+	__u32 id;
-+	__u32 size;
-+	__u32 reserved2[1];
-+	union {
-+		__s32 value;
-+		__s64 value64;
-+		char *string;
-+	};
-+} __attribute__ ((packed));
-+
-+struct v4l2_ext_controls {
-+	__u32 ctrl_class;
-+	__u32 count;
-+	__u32 error_idx;
-+	__u32 reserved[2];
-+	struct v4l2_ext_control *controls;
-+};
-+
-+/*  Values for ctrl_class field */
-+#define V4L2_CTRL_CLASS_USER 0x00980000	/* Old-style 'user' controls */
-+#define V4L2_CTRL_CLASS_MPEG 0x00990000	/* MPEG-compression controls */
-+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000	/* Camera class controls */
-+#define V4L2_CTRL_CLASS_FM_TX 0x009b0000	/* FM Modulator control class */
-+
-+#define V4L2_CTRL_ID_MASK      	  (0x0fffffff)
-+#define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
-+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
-+
-+enum v4l2_ctrl_type {
-+	V4L2_CTRL_TYPE_INTEGER	     = 1,
-+	V4L2_CTRL_TYPE_BOOLEAN	     = 2,
-+	V4L2_CTRL_TYPE_MENU	     = 3,
-+	V4L2_CTRL_TYPE_BUTTON	     = 4,
-+	V4L2_CTRL_TYPE_INTEGER64     = 5,
-+	V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
-+	V4L2_CTRL_TYPE_STRING        = 7,
-+};
-+
-+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-+struct v4l2_queryctrl {
-+	__u32		     id;
-+	enum v4l2_ctrl_type  type;
-+	__u8		     name[32];	/* Whatever */
-+	__s32		     minimum;	/* Note signedness */
-+	__s32		     maximum;
-+	__s32		     step;
-+	__s32		     default_value;
-+	__u32                flags;
-+	__u32		     reserved[2];
-+};
-+
-+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-+struct v4l2_querymenu {
-+	__u32		id;
-+	__u32		index;
-+	__u8		name[32];	/* Whatever */
-+	__u32		reserved;
-+};
-+
-+/*  Control flags  */
-+#define V4L2_CTRL_FLAG_DISABLED		0x0001
-+#define V4L2_CTRL_FLAG_GRABBED		0x0002
-+#define V4L2_CTRL_FLAG_READ_ONLY 	0x0004
-+#define V4L2_CTRL_FLAG_UPDATE 		0x0008
-+#define V4L2_CTRL_FLAG_INACTIVE 	0x0010
-+#define V4L2_CTRL_FLAG_SLIDER 		0x0020
-+#define V4L2_CTRL_FLAG_WRITE_ONLY 	0x0040
-+
-+/*  Query flag, to be ORed with the control ID */
-+#define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
-+
-+/*  User-class control IDs defined by V4L2 */
-+#define V4L2_CID_BASE			(V4L2_CTRL_CLASS_USER | 0x900)
-+#define V4L2_CID_USER_BASE 		V4L2_CID_BASE
-+/*  IDs reserved for driver specific controls */
-+#define V4L2_CID_PRIVATE_BASE		0x08000000
-+
-+#define V4L2_CID_USER_CLASS 		(V4L2_CTRL_CLASS_USER | 1)
-+#define V4L2_CID_BRIGHTNESS		(V4L2_CID_BASE+0)
-+#define V4L2_CID_CONTRAST		(V4L2_CID_BASE+1)
-+#define V4L2_CID_SATURATION		(V4L2_CID_BASE+2)
-+#define V4L2_CID_HUE			(V4L2_CID_BASE+3)
-+#define V4L2_CID_AUDIO_VOLUME		(V4L2_CID_BASE+5)
-+#define V4L2_CID_AUDIO_BALANCE		(V4L2_CID_BASE+6)
-+#define V4L2_CID_AUDIO_BASS		(V4L2_CID_BASE+7)
-+#define V4L2_CID_AUDIO_TREBLE		(V4L2_CID_BASE+8)
-+#define V4L2_CID_AUDIO_MUTE		(V4L2_CID_BASE+9)
-+#define V4L2_CID_AUDIO_LOUDNESS		(V4L2_CID_BASE+10)
-+#define V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11) /* Deprecated */
-+#define V4L2_CID_AUTO_WHITE_BALANCE	(V4L2_CID_BASE+12)
-+#define V4L2_CID_DO_WHITE_BALANCE	(V4L2_CID_BASE+13)
-+#define V4L2_CID_RED_BALANCE		(V4L2_CID_BASE+14)
-+#define V4L2_CID_BLUE_BALANCE		(V4L2_CID_BASE+15)
-+#define V4L2_CID_GAMMA			(V4L2_CID_BASE+16)
-+#define V4L2_CID_WHITENESS		(V4L2_CID_GAMMA) /* Deprecated */
-+#define V4L2_CID_EXPOSURE		(V4L2_CID_BASE+17)
-+#define V4L2_CID_AUTOGAIN		(V4L2_CID_BASE+18)
-+#define V4L2_CID_GAIN			(V4L2_CID_BASE+19)
-+#define V4L2_CID_HFLIP			(V4L2_CID_BASE+20)
-+#define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)
-+
-+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
-+#define V4L2_CID_HCENTER		(V4L2_CID_BASE+22)
-+#define V4L2_CID_VCENTER		(V4L2_CID_BASE+23)
-+
-+#define V4L2_CID_POWER_LINE_FREQUENCY	(V4L2_CID_BASE+24)
-+enum v4l2_power_line_frequency {
-+	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,
-+	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,
-+	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,
-+};
-+#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)
-+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)
-+#define V4L2_CID_SHARPNESS			(V4L2_CID_BASE+27)
-+#define V4L2_CID_BACKLIGHT_COMPENSATION 	(V4L2_CID_BASE+28)
-+#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
-+#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
-+#define V4L2_CID_COLORFX			(V4L2_CID_BASE+31)
-+enum v4l2_colorfx {
-+	V4L2_COLORFX_NONE	= 0,
-+	V4L2_COLORFX_BW		= 1,
-+	V4L2_COLORFX_SEPIA	= 2,
-+	V4L2_COLORFX_NEGATIVE = 3,
-+	V4L2_COLORFX_EMBOSS = 4,
-+	V4L2_COLORFX_SKETCH = 5,
-+	V4L2_COLORFX_SKY_BLUE = 6,
-+	V4L2_COLORFX_GRASS_GREEN = 7,
-+	V4L2_COLORFX_SKIN_WHITEN = 8,
-+	V4L2_COLORFX_VIVID = 9,
-+};
-+#define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)
-+#define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)
-+
-+#define V4L2_CID_ROTATE				(V4L2_CID_BASE+34)
-+#define V4L2_CID_BG_COLOR			(V4L2_CID_BASE+35)
-+
-+#define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
-+
-+#define V4L2_CID_ILLUMINATORS_1			(V4L2_CID_BASE+37)
-+#define V4L2_CID_ILLUMINATORS_2			(V4L2_CID_BASE+38)
-+
-+/* last CID + 1 */
-+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+39)
-+
-+/*  MPEG-class control IDs defined by V4L2 */
-+#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)
-+#define V4L2_CID_MPEG_CLASS 			(V4L2_CTRL_CLASS_MPEG | 1)
-+
-+/*  MPEG streams */
-+#define V4L2_CID_MPEG_STREAM_TYPE 		(V4L2_CID_MPEG_BASE+0)
-+enum v4l2_mpeg_stream_type {
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
-+};
-+#define V4L2_CID_MPEG_STREAM_PID_PMT 		(V4L2_CID_MPEG_BASE+1)
-+#define V4L2_CID_MPEG_STREAM_PID_AUDIO 		(V4L2_CID_MPEG_BASE+2)
-+#define V4L2_CID_MPEG_STREAM_PID_VIDEO 		(V4L2_CID_MPEG_BASE+3)
-+#define V4L2_CID_MPEG_STREAM_PID_PCR 		(V4L2_CID_MPEG_BASE+4)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO 	(V4L2_CID_MPEG_BASE+5)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO 	(V4L2_CID_MPEG_BASE+6)
-+#define V4L2_CID_MPEG_STREAM_VBI_FMT 		(V4L2_CID_MPEG_BASE+7)
-+enum v4l2_mpeg_stream_vbi_fmt {
-+	V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
-+	V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
-+};
-+
-+/*  MPEG audio */
-+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ 	(V4L2_CID_MPEG_BASE+100)
-+enum v4l2_mpeg_audio_sampling_freq {
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_ENCODING 		(V4L2_CID_MPEG_BASE+101)
-+enum v4l2_mpeg_audio_encoding {
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-+	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
-+	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)
-+enum v4l2_mpeg_audio_l1_bitrate {
-+	V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE 		(V4L2_CID_MPEG_BASE+103)
-+enum v4l2_mpeg_audio_l2_bitrate {
-+	V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE 		(V4L2_CID_MPEG_BASE+104)
-+enum v4l2_mpeg_audio_l3_bitrate {
-+	V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE 		(V4L2_CID_MPEG_BASE+105)
-+enum v4l2_mpeg_audio_mode {
-+	V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
-+	V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
-+	V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
-+	V4L2_MPEG_AUDIO_MODE_MONO         = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION 	(V4L2_CID_MPEG_BASE+106)
-+enum v4l2_mpeg_audio_mode_extension {
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_EMPHASIS 		(V4L2_CID_MPEG_BASE+107)
-+enum v4l2_mpeg_audio_emphasis {
-+	V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
-+	V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
-+	V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_CRC 		(V4L2_CID_MPEG_BASE+108)
-+enum v4l2_mpeg_audio_crc {
-+	V4L2_MPEG_AUDIO_CRC_NONE  = 0,
-+	V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MUTE 		(V4L2_CID_MPEG_BASE+109)
-+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE		(V4L2_CID_MPEG_BASE+110)
-+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE		(V4L2_CID_MPEG_BASE+111)
-+enum v4l2_mpeg_audio_ac3_bitrate {
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
-+};
-+
-+/*  MPEG video */
-+#define V4L2_CID_MPEG_VIDEO_ENCODING 		(V4L2_CID_MPEG_BASE+200)
-+enum v4l2_mpeg_video_encoding {
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
-+};
-+#define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)
-+enum v4l2_mpeg_video_aspect {
-+	V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
-+	V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
-+	V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
-+	V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
-+};
-+#define V4L2_CID_MPEG_VIDEO_B_FRAMES 		(V4L2_CID_MPEG_BASE+202)
-+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE 		(V4L2_CID_MPEG_BASE+203)
-+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE 	(V4L2_CID_MPEG_BASE+204)
-+#define V4L2_CID_MPEG_VIDEO_PULLDOWN 		(V4L2_CID_MPEG_BASE+205)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE 	(V4L2_CID_MPEG_BASE+206)
-+enum v4l2_mpeg_video_bitrate_mode {
-+	V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
-+	V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
-+};
-+#define V4L2_CID_MPEG_VIDEO_BITRATE 		(V4L2_CID_MPEG_BASE+207)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK 	(V4L2_CID_MPEG_BASE+208)
-+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-+#define V4L2_CID_MPEG_VIDEO_MUTE 		(V4L2_CID_MPEG_BASE+210)
-+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV 		(V4L2_CID_MPEG_BASE+211)
-+
-+/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-+#define V4L2_CID_MPEG_CX2341X_BASE 				(V4L2_CTRL_CLASS_MPEG | 0x1000)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+0)
-+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
-+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+1)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+2)
-+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+3)
-+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+4)
-+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
-+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+5)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE 		(V4L2_CID_MPEG_CX2341X_BASE+6)
-+enum v4l2_mpeg_cx2341x_video_median_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM 	(V4L2_CID_MPEG_CX2341X_BASE+7)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+8)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM	(V4L2_CID_MPEG_CX2341X_BASE+9)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+10)
-+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS 	(V4L2_CID_MPEG_CX2341X_BASE+11)
-+
-+/*  Camera class control IDs */
-+#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)
-+#define V4L2_CID_CAMERA_CLASS 		(V4L2_CTRL_CLASS_CAMERA | 1)
-+
-+#define V4L2_CID_EXPOSURE_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+1)
-+enum  v4l2_exposure_auto_type {
-+	V4L2_EXPOSURE_AUTO = 0,
-+	V4L2_EXPOSURE_MANUAL = 1,
-+	V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
-+	V4L2_EXPOSURE_APERTURE_PRIORITY = 3
-+};
-+#define V4L2_CID_EXPOSURE_ABSOLUTE		(V4L2_CID_CAMERA_CLASS_BASE+2)
-+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY		(V4L2_CID_CAMERA_CLASS_BASE+3)
-+
-+#define V4L2_CID_PAN_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+4)
-+#define V4L2_CID_TILT_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+5)
-+#define V4L2_CID_PAN_RESET			(V4L2_CID_CAMERA_CLASS_BASE+6)
-+#define V4L2_CID_TILT_RESET			(V4L2_CID_CAMERA_CLASS_BASE+7)
-+
-+#define V4L2_CID_PAN_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+8)
-+#define V4L2_CID_TILT_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+9)
-+
-+#define V4L2_CID_FOCUS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+10)
-+#define V4L2_CID_FOCUS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+11)
-+#define V4L2_CID_FOCUS_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+12)
-+
-+#define V4L2_CID_ZOOM_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+13)
-+#define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
-+#define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
-+
-+#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
-+
-+#define V4L2_CID_IRIS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+17)
-+#define V4L2_CID_IRIS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+18)
-+
-+/* FM Modulator class control IDs */
-+#define V4L2_CID_FM_TX_CLASS_BASE		(V4L2_CTRL_CLASS_FM_TX | 0x900)
-+#define V4L2_CID_FM_TX_CLASS			(V4L2_CTRL_CLASS_FM_TX | 1)
-+
-+#define V4L2_CID_RDS_TX_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 1)
-+#define V4L2_CID_RDS_TX_PI			(V4L2_CID_FM_TX_CLASS_BASE + 2)
-+#define V4L2_CID_RDS_TX_PTY			(V4L2_CID_FM_TX_CLASS_BASE + 3)
-+#define V4L2_CID_RDS_TX_PS_NAME			(V4L2_CID_FM_TX_CLASS_BASE + 5)
-+#define V4L2_CID_RDS_TX_RADIO_TEXT		(V4L2_CID_FM_TX_CLASS_BASE + 6)
-+
-+#define V4L2_CID_AUDIO_LIMITER_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 64)
-+#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 65)
-+#define V4L2_CID_AUDIO_LIMITER_DEVIATION	(V4L2_CID_FM_TX_CLASS_BASE + 66)
-+
-+#define V4L2_CID_AUDIO_COMPRESSION_ENABLED	(V4L2_CID_FM_TX_CLASS_BASE + 80)
-+#define V4L2_CID_AUDIO_COMPRESSION_GAIN		(V4L2_CID_FM_TX_CLASS_BASE + 81)
-+#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD	(V4L2_CID_FM_TX_CLASS_BASE + 82)
-+#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 83)
-+#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 84)
-+
-+#define V4L2_CID_PILOT_TONE_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 96)
-+#define V4L2_CID_PILOT_TONE_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 97)
-+#define V4L2_CID_PILOT_TONE_FREQUENCY		(V4L2_CID_FM_TX_CLASS_BASE + 98)
-+
-+#define V4L2_CID_TUNE_PREEMPHASIS		(V4L2_CID_FM_TX_CLASS_BASE + 112)
-+enum v4l2_preemphasis {
-+	V4L2_PREEMPHASIS_DISABLED	= 0,
-+	V4L2_PREEMPHASIS_50_uS		= 1,
-+	V4L2_PREEMPHASIS_75_uS		= 2,
-+};
-+#define V4L2_CID_TUNE_POWER_LEVEL		(V4L2_CID_FM_TX_CLASS_BASE + 113)
-+#define V4L2_CID_TUNE_ANTENNA_CAPACITOR		(V4L2_CID_FM_TX_CLASS_BASE + 114)
-+
-+/*
-+ *	T U N I N G
-+ */
-+struct v4l2_tuner {
-+	__u32                   index;
-+	__u8			name[32];
-+	enum v4l2_tuner_type    type;
-+	__u32			capability;
-+	__u32			rangelow;
-+	__u32			rangehigh;
-+	__u32			rxsubchans;
-+	__u32			audmode;
-+	__s32			signal;
-+	__s32			afc;
-+	__u32			reserved[4];
-+};
-+
-+struct v4l2_modulator {
-+	__u32			index;
-+	__u8			name[32];
-+	__u32			capability;
-+	__u32			rangelow;
-+	__u32			rangehigh;
-+	__u32			txsubchans;
-+	__u32			reserved[4];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_TUNER_CAP_LOW		0x0001
-+#define V4L2_TUNER_CAP_NORM		0x0002
-+#define V4L2_TUNER_CAP_STEREO		0x0010
-+#define V4L2_TUNER_CAP_LANG2		0x0020
-+#define V4L2_TUNER_CAP_SAP		0x0020
-+#define V4L2_TUNER_CAP_LANG1		0x0040
-+#define V4L2_TUNER_CAP_RDS		0x0080
-+#define V4L2_TUNER_CAP_RDS_BLOCK_IO	0x0100
-+#define V4L2_TUNER_CAP_RDS_CONTROLS	0x0200
-+
-+/*  Flags for the 'rxsubchans' field */
-+#define V4L2_TUNER_SUB_MONO		0x0001
-+#define V4L2_TUNER_SUB_STEREO		0x0002
-+#define V4L2_TUNER_SUB_LANG2		0x0004
-+#define V4L2_TUNER_SUB_SAP		0x0004
-+#define V4L2_TUNER_SUB_LANG1		0x0008
-+#define V4L2_TUNER_SUB_RDS		0x0010
-+
-+/*  Values for the 'audmode' field */
-+#define V4L2_TUNER_MODE_MONO		0x0000
-+#define V4L2_TUNER_MODE_STEREO		0x0001
-+#define V4L2_TUNER_MODE_LANG2		0x0002
-+#define V4L2_TUNER_MODE_SAP		0x0002
-+#define V4L2_TUNER_MODE_LANG1		0x0003
-+#define V4L2_TUNER_MODE_LANG1_LANG2	0x0004
-+
-+struct v4l2_frequency {
-+	__u32		      tuner;
-+	enum v4l2_tuner_type  type;
-+	__u32		      frequency;
-+	__u32		      reserved[8];
-+};
-+
-+struct v4l2_hw_freq_seek {
-+	__u32		      tuner;
-+	enum v4l2_tuner_type  type;
-+	__u32		      seek_upward;
-+	__u32		      wrap_around;
-+	__u32		      spacing;
-+	__u32		      reserved[7];
-+};
-+
-+/*
-+ *	R D S
-+ */
-+
-+struct v4l2_rds_data {
-+	__u8 	lsb;
-+	__u8 	msb;
-+	__u8 	block;
-+} __attribute__ ((packed));
-+
-+#define V4L2_RDS_BLOCK_MSK 	 0x7
-+#define V4L2_RDS_BLOCK_A 	 0
-+#define V4L2_RDS_BLOCK_B 	 1
-+#define V4L2_RDS_BLOCK_C 	 2
-+#define V4L2_RDS_BLOCK_D 	 3
-+#define V4L2_RDS_BLOCK_C_ALT 	 4
-+#define V4L2_RDS_BLOCK_INVALID 	 7
-+
-+#define V4L2_RDS_BLOCK_CORRECTED 0x40
-+#define V4L2_RDS_BLOCK_ERROR 	 0x80
-+
-+/*
-+ *	A U D I O
-+ */
-+struct v4l2_audio {
-+	__u32	index;
-+	__u8	name[32];
-+	__u32	capability;
-+	__u32	mode;
-+	__u32	reserved[2];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_AUDCAP_STEREO		0x00001
-+#define V4L2_AUDCAP_AVL			0x00002
-+
-+/*  Flags for the 'mode' field */
-+#define V4L2_AUDMODE_AVL		0x00001
-+
-+struct v4l2_audioout {
-+	__u32	index;
-+	__u8	name[32];
-+	__u32	capability;
-+	__u32	mode;
-+	__u32	reserved[2];
-+};
-+
-+/*
-+ *	M P E G   S E R V I C E S
-+ *
-+ *	NOTE: EXPERIMENTAL API
-+ */
-+#if 1
-+#define V4L2_ENC_IDX_FRAME_I    (0)
-+#define V4L2_ENC_IDX_FRAME_P    (1)
-+#define V4L2_ENC_IDX_FRAME_B    (2)
-+#define V4L2_ENC_IDX_FRAME_MASK (0xf)
-+
-+struct v4l2_enc_idx_entry {
-+	__u64 offset;
-+	__u64 pts;
-+	__u32 length;
-+	__u32 flags;
-+	__u32 reserved[2];
-+};
-+
-+#define V4L2_ENC_IDX_ENTRIES (64)
-+struct v4l2_enc_idx {
-+	__u32 entries;
-+	__u32 entries_cap;
-+	__u32 reserved[4];
-+	struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
-+};
-+
-+
-+#define V4L2_ENC_CMD_START      (0)
-+#define V4L2_ENC_CMD_STOP       (1)
-+#define V4L2_ENC_CMD_PAUSE      (2)
-+#define V4L2_ENC_CMD_RESUME     (3)
-+
-+/* Flags for V4L2_ENC_CMD_STOP */
-+#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
-+
-+struct v4l2_encoder_cmd {
-+	__u32 cmd;
-+	__u32 flags;
-+	union {
-+		struct {
-+			__u32 data[8];
-+		} raw;
-+	};
-+};
-+
-+#endif
-+
-+
-+/*
-+ *	D A T A   S E R V I C E S   ( V B I )
-+ *
-+ *	Data services API by Michael Schimek
-+ */
-+
-+/* Raw VBI */
-+struct v4l2_vbi_format {
-+	__u32	sampling_rate;		/* in 1 Hz */
-+	__u32	offset;
-+	__u32	samples_per_line;
-+	__u32	sample_format;		/* V4L2_PIX_FMT_* */
-+	__s32	start[2];
-+	__u32	count[2];
-+	__u32	flags;			/* V4L2_VBI_* */
-+	__u32	reserved[2];		/* must be zero */
-+};
-+
-+/*  VBI flags  */
-+#define V4L2_VBI_UNSYNC		(1 << 0)
-+#define V4L2_VBI_INTERLACED	(1 << 1)
-+
-+/* Sliced VBI
-+ *
-+ *    This implements is a proposal V4L2 API to allow SLICED VBI
-+ * required for some hardware encoders. It should change without
-+ * notice in the definitive implementation.
-+ */
-+
-+struct v4l2_sliced_vbi_format {
-+	__u16   service_set;
-+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-+				 (equals frame lines 313-336 for 625 line video
-+				  standards, 263-286 for 525 line standards) */
-+	__u16   service_lines[2][24];
-+	__u32   io_size;
-+	__u32   reserved[2];            /* must be zero */
-+};
-+
-+/* Teletext World System Teletext
-+   (WST), defined on ITU-R BT.653-2 */
-+#define V4L2_SLICED_TELETEXT_B          (0x0001)
-+/* Video Program System, defined on ETS 300 231*/
-+#define V4L2_SLICED_VPS                 (0x0400)
-+/* Closed Caption, defined on EIA-608 */
-+#define V4L2_SLICED_CAPTION_525         (0x1000)
-+/* Wide Screen System, defined on ITU-R BT1119.1 */
-+#define V4L2_SLICED_WSS_625             (0x4000)
-+
-+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
-+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
-+
-+struct v4l2_sliced_vbi_cap {
-+	__u16   service_set;
-+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-+				 (equals frame lines 313-336 for 625 line video
-+				  standards, 263-286 for 525 line standards) */
-+	__u16   service_lines[2][24];
-+	enum v4l2_buf_type type;
-+	__u32   reserved[3];    /* must be 0 */
-+};
-+
-+struct v4l2_sliced_vbi_data {
-+	__u32   id;
-+	__u32   field;          /* 0: first field, 1: second field */
-+	__u32   line;           /* 1-23 */
-+	__u32   reserved;       /* must be 0 */
-+	__u8    data[48];
-+};
-+
-+/*
-+ * Sliced VBI data inserted into MPEG Streams
-+ */
-+
-+/*
-+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
-+ *
-+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
-+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
-+ * data
-+ *
-+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
-+ * definitions are not included here.  See the MPEG-2 specifications for details
-+ * on these headers.
-+ */
-+
-+/* Line type IDs */
-+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
-+#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
-+#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
-+#define V4L2_MPEG_VBI_IVTV_VPS            (7)
-+
-+struct v4l2_mpeg_vbi_itv0_line {
-+	__u8 id;	/* One of V4L2_MPEG_VBI_IVTV_* above */
-+	__u8 data[42];	/* Sliced VBI data for the line */
-+} __attribute__ ((packed));
-+
-+struct v4l2_mpeg_vbi_itv0 {
-+	__le32 linemask[2]; /* Bitmasks of VBI service lines present */
-+	struct v4l2_mpeg_vbi_itv0_line line[35];
-+} __attribute__ ((packed));
-+
-+struct v4l2_mpeg_vbi_ITV0 {
-+	struct v4l2_mpeg_vbi_itv0_line line[36];
-+} __attribute__ ((packed));
-+
-+#define V4L2_MPEG_VBI_IVTV_MAGIC0	"itv0"
-+#define V4L2_MPEG_VBI_IVTV_MAGIC1	"ITV0"
-+
-+struct v4l2_mpeg_vbi_fmt_ivtv {
-+	__u8 magic[4];
-+	union {
-+		struct v4l2_mpeg_vbi_itv0 itv0;
-+		struct v4l2_mpeg_vbi_ITV0 ITV0;
-+	};
-+} __attribute__ ((packed));
-+
-+/*
-+ *	A G G R E G A T E   S T R U C T U R E S
-+ */
-+
-+/**
-+ * struct v4l2_plane_pix_format - additional, per-plane format definition
-+ * @sizeimage:		maximum size in bytes required for data, for which
-+ *			this plane will be used
-+ * @bytesperline:	distance in bytes between the leftmost pixels in two
-+ *			adjacent lines
-+ */
-+struct v4l2_plane_pix_format {
-+	__u32		sizeimage;
-+	__u16		bytesperline;
-+	__u16		reserved[7];
-+} __attribute__ ((packed));
-+
-+/**
-+ * struct v4l2_pix_format_mplane - multiplanar format definition
-+ * @width:		image width in pixels
-+ * @height:		image height in pixels
-+ * @pixelformat:	little endian four character code (fourcc)
-+ * @field:		field order (for interlaced video)
-+ * @colorspace:		supplemental to pixelformat
-+ * @plane_fmt:		per-plane information
-+ * @num_planes:		number of planes for this format
-+ */
-+struct v4l2_pix_format_mplane {
-+	__u32				width;
-+	__u32				height;
-+	__u32				pixelformat;
-+	enum v4l2_field			field;
-+	enum v4l2_colorspace		colorspace;
-+
-+	struct v4l2_plane_pix_format	plane_fmt[VIDEO_MAX_PLANES];
-+	__u8				num_planes;
-+	__u8				reserved[11];
-+} __attribute__ ((packed));
-+
-+/**
-+ * struct v4l2_format - stream data format
-+ * @type:	type of the data stream
-+ * @pix:	definition of an image format
-+ * @pix_mp:	definition of a multiplanar image format
-+ * @win:	definition of an overlaid image
-+ * @vbi:	raw VBI capture or output parameters
-+ * @sliced:	sliced VBI capture or output parameters
-+ * @raw_data:	placeholder for future extensions and custom formats
-+ */
-+struct v4l2_format {
-+	enum v4l2_buf_type type;
-+	union {
-+		struct v4l2_pix_format		pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
-+		struct v4l2_pix_format_mplane	pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
-+		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
-+		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
-+		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
-+		__u8	raw_data[200];                   /* user-defined */
-+	} fmt;
-+};
-+
-+/*	Stream type-dependent parameters
-+ */
-+struct v4l2_streamparm {
-+	enum v4l2_buf_type type;
-+	union {
-+		struct v4l2_captureparm	capture;
-+		struct v4l2_outputparm	output;
-+		__u8	raw_data[200];  /* user-defined */
-+	} parm;
-+};
-+
-+/*
-+ *	E V E N T S
-+ */
-+
-+#define V4L2_EVENT_ALL				0
-+#define V4L2_EVENT_VSYNC			1
-+#define V4L2_EVENT_EOS				2
-+#define V4L2_EVENT_PRIVATE_START		0x08000000
-+
-+/* Payload for V4L2_EVENT_VSYNC */
-+struct v4l2_event_vsync {
-+	/* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */
-+	__u8 field;
-+} __attribute__ ((packed));
-+
-+struct v4l2_event {
-+	__u32				type;
-+	union {
-+		struct v4l2_event_vsync vsync;
-+		__u8			data[64];
-+	} u;
-+	__u32				pending;
-+	__u32				sequence;
-+	struct timespec			timestamp;
-+	__u32				reserved[9];
-+};
-+
-+struct v4l2_event_subscription {
-+	__u32				type;
-+	__u32				reserved[7];
-+};
-+
-+/*
-+ *	A D V A N C E D   D E B U G G I N G
-+ *
-+ *	NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
-+ *	FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
-+ */
-+
-+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
-+
-+#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
-+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
-+#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
-+#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
-+
-+struct v4l2_dbg_match {
-+	__u32 type; /* Match type */
-+	union {     /* Match this chip, meaning determined by type */
-+		__u32 addr;
-+		char name[32];
-+	};
-+} __attribute__ ((packed));
-+
-+struct v4l2_dbg_register {
-+	struct v4l2_dbg_match match;
-+	__u32 size;	/* register size in bytes */
-+	__u64 reg;
-+	__u64 val;
-+} __attribute__ ((packed));
-+
-+/* VIDIOC_DBG_G_CHIP_IDENT */
-+struct v4l2_dbg_chip_ident {
-+	struct v4l2_dbg_match match;
-+	__u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
-+	__u32 revision;    /* chip revision, chip specific */
-+} __attribute__ ((packed));
-+
-+/*
-+ *	I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
-+ *
-+ */
-+#define VIDIOC_QUERYCAP		 _IOR('V',  0, struct v4l2_capability)
-+#define VIDIOC_RESERVED		  _IO('V',  1)
-+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
-+#define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
-+#define VIDIOC_S_FMT		_IOWR('V',  5, struct v4l2_format)
-+#define VIDIOC_REQBUFS		_IOWR('V',  8, struct v4l2_requestbuffers)
-+#define VIDIOC_QUERYBUF		_IOWR('V',  9, struct v4l2_buffer)
-+#define VIDIOC_G_FBUF		 _IOR('V', 10, struct v4l2_framebuffer)
-+#define VIDIOC_S_FBUF		 _IOW('V', 11, struct v4l2_framebuffer)
-+#define VIDIOC_OVERLAY		 _IOW('V', 14, int)
-+#define VIDIOC_QBUF		_IOWR('V', 15, struct v4l2_buffer)
-+#define VIDIOC_DQBUF		_IOWR('V', 17, struct v4l2_buffer)
-+#define VIDIOC_STREAMON		 _IOW('V', 18, int)
-+#define VIDIOC_STREAMOFF	 _IOW('V', 19, int)
-+#define VIDIOC_G_PARM		_IOWR('V', 21, struct v4l2_streamparm)
-+#define VIDIOC_S_PARM		_IOWR('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_G_STD		 _IOR('V', 23, v4l2_std_id)
-+#define VIDIOC_S_STD		 _IOW('V', 24, v4l2_std_id)
-+#define VIDIOC_ENUMSTD		_IOWR('V', 25, struct v4l2_standard)
-+#define VIDIOC_ENUMINPUT	_IOWR('V', 26, struct v4l2_input)
-+#define VIDIOC_G_CTRL		_IOWR('V', 27, struct v4l2_control)
-+#define VIDIOC_S_CTRL		_IOWR('V', 28, struct v4l2_control)
-+#define VIDIOC_G_TUNER		_IOWR('V', 29, struct v4l2_tuner)
-+#define VIDIOC_S_TUNER		 _IOW('V', 30, struct v4l2_tuner)
-+#define VIDIOC_G_AUDIO		 _IOR('V', 33, struct v4l2_audio)
-+#define VIDIOC_S_AUDIO		 _IOW('V', 34, struct v4l2_audio)
-+#define VIDIOC_QUERYCTRL	_IOWR('V', 36, struct v4l2_queryctrl)
-+#define VIDIOC_QUERYMENU	_IOWR('V', 37, struct v4l2_querymenu)
-+#define VIDIOC_G_INPUT		 _IOR('V', 38, int)
-+#define VIDIOC_S_INPUT		_IOWR('V', 39, int)
-+#define VIDIOC_G_OUTPUT		 _IOR('V', 46, int)
-+#define VIDIOC_S_OUTPUT		_IOWR('V', 47, int)
-+#define VIDIOC_ENUMOUTPUT	_IOWR('V', 48, struct v4l2_output)
-+#define VIDIOC_G_AUDOUT		 _IOR('V', 49, struct v4l2_audioout)
-+#define VIDIOC_S_AUDOUT		 _IOW('V', 50, struct v4l2_audioout)
-+#define VIDIOC_G_MODULATOR	_IOWR('V', 54, struct v4l2_modulator)
-+#define VIDIOC_S_MODULATOR	 _IOW('V', 55, struct v4l2_modulator)
-+#define VIDIOC_G_FREQUENCY	_IOWR('V', 56, struct v4l2_frequency)
-+#define VIDIOC_S_FREQUENCY	 _IOW('V', 57, struct v4l2_frequency)
-+#define VIDIOC_CROPCAP		_IOWR('V', 58, struct v4l2_cropcap)
-+#define VIDIOC_G_CROP		_IOWR('V', 59, struct v4l2_crop)
-+#define VIDIOC_S_CROP		 _IOW('V', 60, struct v4l2_crop)
-+#define VIDIOC_G_JPEGCOMP	 _IOR('V', 61, struct v4l2_jpegcompression)
-+#define VIDIOC_S_JPEGCOMP	 _IOW('V', 62, struct v4l2_jpegcompression)
-+#define VIDIOC_QUERYSTD      	 _IOR('V', 63, v4l2_std_id)
-+#define VIDIOC_TRY_FMT      	_IOWR('V', 64, struct v4l2_format)
-+#define VIDIOC_ENUMAUDIO	_IOWR('V', 65, struct v4l2_audio)
-+#define VIDIOC_ENUMAUDOUT	_IOWR('V', 66, struct v4l2_audioout)
-+#define VIDIOC_G_PRIORITY        _IOR('V', 67, enum v4l2_priority)
-+#define VIDIOC_S_PRIORITY        _IOW('V', 68, enum v4l2_priority)
-+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
-+#define VIDIOC_LOG_STATUS         _IO('V', 70)
-+#define VIDIOC_G_EXT_CTRLS	_IOWR('V', 71, struct v4l2_ext_controls)
-+#define VIDIOC_S_EXT_CTRLS	_IOWR('V', 72, struct v4l2_ext_controls)
-+#define VIDIOC_TRY_EXT_CTRLS	_IOWR('V', 73, struct v4l2_ext_controls)
-+#if 1
-+#define VIDIOC_ENUM_FRAMESIZES	_IOWR('V', 74, struct v4l2_frmsizeenum)
-+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
-+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
-+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
-+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
-+#endif
-+
-+#if 1
-+/* Experimental, meant for debugging, testing and internal use.
-+   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
-+   You must be root to use these ioctls. Never use these in applications! */
-+#define	VIDIOC_DBG_S_REGISTER 	 _IOW('V', 79, struct v4l2_dbg_register)
-+#define	VIDIOC_DBG_G_REGISTER 	_IOWR('V', 80, struct v4l2_dbg_register)
-+
-+/* Experimental, meant for debugging, testing and internal use.
-+   Never use this ioctl in applications! */
-+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-+#endif
-+
-+#define VIDIOC_S_HW_FREQ_SEEK	 _IOW('V', 82, struct v4l2_hw_freq_seek)
-+#define	VIDIOC_ENUM_DV_PRESETS	_IOWR('V', 83, struct v4l2_dv_enum_preset)
-+#define	VIDIOC_S_DV_PRESET	_IOWR('V', 84, struct v4l2_dv_preset)
-+#define	VIDIOC_G_DV_PRESET	_IOWR('V', 85, struct v4l2_dv_preset)
-+#define	VIDIOC_QUERY_DV_PRESET	_IOR('V',  86, struct v4l2_dv_preset)
-+#define	VIDIOC_S_DV_TIMINGS	_IOWR('V', 87, struct v4l2_dv_timings)
-+#define	VIDIOC_G_DV_TIMINGS	_IOWR('V', 88, struct v4l2_dv_timings)
-+#define	VIDIOC_DQEVENT		 _IOR('V', 89, struct v4l2_event)
-+#define	VIDIOC_SUBSCRIBE_EVENT	 _IOW('V', 90, struct v4l2_event_subscription)
-+#define	VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
-+
-+#define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
-+
-+#endif /* __LINUX_VIDEODEV2_H */
diff --git a/testing/xf86-video-vesa/PKGBUILD b/testing/xf86-video-vesa/PKGBUILD
deleted file mode 100644
index 222c80a1e..000000000
--- a/testing/xf86-video-vesa/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168246 2012-10-06 20:08:43Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-vesa
-pkgver=2.3.2
-pkgrel=2
-pkgdesc="X.org vesa video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        revert-kernelcheck.patch)
-sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
-            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
-  ./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-video-vesa/revert-kernelcheck.patch b/testing/xf86-video-vesa/revert-kernelcheck.patch
deleted file mode 100644
index 37418cc3f..000000000
--- a/testing/xf86-video-vesa/revert-kernelcheck.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 08 Dec 2010 18:45:32 +0000
-Subject: Refuse to load if there's a kernel driver bound to the device
-
-Ported from the equivalent check in nv.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 168fde1..2523d76 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
-     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
- 				NULL, NULL, NULL, NULL, NULL);
-     if (pScrn != NULL) {
--	VESAPtr pVesa = VESAGetRec(pScrn);
-+	VESAPtr pVesa;
- 
-+	if (pci_device_has_kernel_driver(dev)) {
-+	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
-+	    return FALSE;
-+	}
-+
-+	pVesa = VESAGetRec(pScrn);
- 	VESAInitScrn(pScrn);
- 	pVesa->pciInfo = dev;
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-vmware/PKGBUILD b/testing/xf86-video-vmware/PKGBUILD
deleted file mode 100644
index fbb53aec9..000000000
--- a/testing/xf86-video-vmware/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168247 2012-10-06 20:08:48Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-vmware
-pkgver=12.0.2
-pkgrel=2
-pkgdesc="X.org vmware video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libdrm' 'svga-dri' 'mesa')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
-sha1sums=('efa47f365d88da245804a9934719ff860ed04f95'
-          'ad475b37e2614f365533a40da0fb5b9e2709e3c6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-  ./configure --prefix=/usr --enable-vmwarectrl-client
-  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-vmware/git_fixes.diff b/testing/xf86-video-vmware/git_fixes.diff
deleted file mode 100644
index 85894169e..000000000
--- a/testing/xf86-video-vmware/git_fixes.diff
+++ /dev/null
@@ -1,894 +0,0 @@
-From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 20 Apr 2012 20:24:26 +0000
-Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces
-
-This fixes a failed assertion in the gallium/svga driver in the
-svga_texture_get_handle() function.  The texture resource wasn't
-getting created with the PIPE_BIND_SHARED flag so the !cachable
-assertion would fail and the X session would abort.  This didn't
-happen with release builds.
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
-index 2a18762..8b30e45 100644
---- a/vmwgfx/vmwgfx_xa_surface.c
-+++ b/vmwgfx/vmwgfx_xa_surface.c
-@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap,
- 
-     vpix->staging_format = format;
-     vpix->staging_remove_flags = 0;
--    vpix->staging_add_flags = XA_FLAG_RENDER_TARGET;
-+    vpix->staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED;
- 
-     return TRUE;
- }
---
-cgit v0.9.0.2-2-gbebe
-From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 06 Jun 2012 08:58:01 +0000
-Subject: vmware: port vmware driver to new compat API
-
-This is a port of the vmware driver to the new compat API.
-
-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/saa/saa.c b/saa/saa.c
-index 173c090..f2d68e9 100644
---- a/saa/saa.c
-+++ b/saa/saa.c
-@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable)
-  * screen private, before calling down to the next CloseScreen.
-  */
- Bool
--saa_close_screen(int i, ScreenPtr pScreen)
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
-     struct saa_screen_priv *sscreen = saa_screen(pScreen);
-     struct saa_driver *driver = sscreen->driver;
-@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen)
- 
-     free(sscreen);
- 
--    return (*pScreen->CloseScreen) (i, pScreen);
-+    return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
- }
- 
- struct saa_driver *
-diff --git a/saa/saa.h b/saa/saa.h
-index c7aa3b6..4e5ced5 100644
---- a/saa/saa.h
-+++ b/saa/saa.h
-@@ -44,6 +44,8 @@
- #include <damage.h>
- #include <picturestr.h>
- 
-+#include "../src/compat-api.h"
-+
- #define SAA_VERSION_MAJOR 0
- #define SAA_VERSION_MINOR 1
- 
-@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr
- saa_bitmap_to_region(PixmapPtr pPix);
- 
- extern _X_EXPORT Bool
--saa_close_screen(int i, ScreenPtr pScreen);
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL);
- 
- extern _X_EXPORT Bool
- saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 04c9e0d..b0dd147 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,6 +37,7 @@ endif
- vmware_drv_la_SOURCES = \
- 	bits2pixels.c \
- 	bits2pixels.h \
-+	compat-api.h \
- 	guest_os.h \
- 	includeCheck.h \
- 	svga_escape.h \
-diff --git a/src/compat-api.h b/src/compat-api.h
-new file mode 100644
-index 0000000..6bc946f
---- a/dev/null
-+++ b/src/compat-api.h
-@@ -0,0 +1,99 @@
-+/*
-+ * Copyright 2012 Red Hat, Inc.
-+ *
-+ * 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.
-+ *
-+ * Author: Dave Airlie <airlied@redhat.com>
-+ */
-+
-+/* this file provides API compat between server post 1.13 and pre it,
-+   it should be reused inside as many drivers as possible */
-+#ifndef COMPAT_API_H
-+#define COMPAT_API_H
-+
-+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-+#endif
-+
-+#ifndef XF86_HAS_SCRN_CONV
-+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-+#endif
-+
-+#ifndef XF86_SCRN_INTERFACE
-+
-+#define SCRN_ARG_TYPE int
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
-+
-+#define SCREEN_ARG_TYPE int
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-+
-+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
-+
-+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
-+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
-+
-+#define FREE_SCREEN_ARGS_DECL int arg, int flags
-+
-+#define VT_FUNC_ARGS_DECL int arg, int flags
-+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
-+
-+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
-+#else
-+#define SCRN_ARG_TYPE ScrnInfoPtr
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
-+
-+#define SCREEN_ARG_TYPE ScreenPtr
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
-+
-+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
-+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
-+
-+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
-+#define SWITCH_MODE_ARGS(arg, m) arg, m
-+
-+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
-+
-+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
-+#define VT_FUNC_ARGS pScrn
-+
-+#define XF86_SCRN_ARG(x) (x)
-+
-+#endif
-+
-+#endif
-diff --git a/src/vmware.c b/src/vmware.c
-index e3892f1..41201f1 100644
---- a/src/vmware.c
-+++ b/src/vmware.c
-@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap)
-                                                          pScrn->pScreen->rootDepth),
-                                            (pointer)(pVMWARE->FbBase + pScrn->fbOffset));
- 
--        (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE);
--        (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE);
-+        (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE);
-+        (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE);
-     }
- 
-     vgaHWProtect(pScrn, FALSE);
-@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE)
- }
- 
- static void
--VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags)
-+VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL)
- {
-     /* FIXME */
- }
-@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn)
- }
- 
- static Bool
--VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
-+VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     ScreenPtr save = &pVMWARE->ScrnFuncs;
- 
-@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
-     pScrn->DriverFunc = NULL;
- #endif
- 
--    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
-+    return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
- }
- 
- static Bool
-@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1,
- }
- 
- static Bool
--VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn;
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     vgaHWPtr hwp;
-     VMWAREPtr pVMWARE;
-     OptionInfoPtr options;
-     Bool useXinerama = TRUE;
- 
--    /* Get the ScrnInfoRec */
--    pScrn = xf86Screens[pScreen->myNum];
-     pVMWARE = VMWAREPTR(pScrn);
- 
- 
-@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     VMWAREModeInit(pScrn, pScrn->currentMode, FALSE);
- 
-     /* Set the viewport if supported */
--    VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+    VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
- 
-     /*
-      * Setup the screen's visuals, and initialise the framebuffer
-@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
- 
- static Bool
--VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
--
-+VMWARESwitchMode(SWITCH_MODE_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     ScreenPtr pScreen = pScrn->pScreen;
- 
-     pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM +
-@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- }
- 
- static Bool
--VMWAREEnterVT(int scrnIndex, int flags)
-+VMWAREEnterVT(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- 
-     /*
-@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags)
- }
- 
- static void
--VMWARELeaveVT(int scrnIndex, int flags)
-+VMWARELeaveVT(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- 
-     /*
-@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags)
- }
- 
- static void
--VMWAREFreeScreen(int scrnIndex, int flags)
-+VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL)
- {
-+    SCRN_INFO_PTR(arg);
-     /*
-      * If the vgahw module is used vgaHWFreeHWRec() would be called
-      * here.
-      */
--   VMWAREFreeRec(xf86Screens[scrnIndex]);
-+   VMWAREFreeRec(pScrn);
- }
- 
- static ModeStatus
--VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-+VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
- {
-     return MODE_OK;
- }
-diff --git a/src/vmware.h b/src/vmware.h
-index 458390a..4818e16 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -177,7 +177,7 @@ typedef struct {
- #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
- 
- static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
--    return xf86Screens[s->myNum];
-+    return xf86ScreenToScrn(s);
- }
- 
- #define MIN(a,b) ((a)<(b)?(a):(b))
-diff --git a/src/vmware_common.h b/src/vmware_common.h
-index 9cd7194..5629c10 100644
---- a/src/vmware_common.h
-+++ b/src/vmware_common.h
-@@ -32,6 +32,8 @@
- #include <X11/extensions/panoramiXproto.h>
- #include <xf86.h>
- 
-+#include "compat-api.h"
-+
- xXineramaScreenInfo *
- VMWAREParseTopologyString(ScrnInfoPtr pScrn,
-                           const char *topology,
-diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
-index 1b82ac4..7de0772 100644
---- a/vmwgfx/vmwgfx_dri2.c
-+++ b/vmwgfx/vmwgfx_dri2.c
-@@ -83,7 +83,7 @@ static Bool
- dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format)
- {
-     ScreenPtr pScreen = pDraw->pScreen;
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     BufferPrivatePtr private = buffer->driverPrivate;
-     PixmapPtr pPixmap;
-@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
- Bool
- xorg_dri2_init(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     DRI2InfoRec dri2info;
-     int major, minor;
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index ed1eb8c..9959ffb 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -107,14 +107,13 @@ typedef uint8_t uint8;
-  */
- 
- static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags);
--static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc,
--			    char **argv);
--static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags);
--static void drv_adjust_frame(int scrnIndex, int x, int y, int flags);
--static Bool drv_enter_vt(int scrnIndex, int flags);
--static void drv_leave_vt(int scrnIndex, int flags);
--static void drv_free_screen(int scrnIndex, int flags);
--static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose,
-+static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL);
-+static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL);
-+static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL);
-+static Bool drv_enter_vt(VT_FUNC_ARGS_DECL);
-+static void drv_leave_vt(VT_FUNC_ARGS_DECL);
-+static void drv_free_screen(FREE_SCREEN_ARGS_DECL);
-+static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose,
- 			         int flags);
- 
- extern void xorg_tracker_set_functions(ScrnInfoPtr scrn);
-@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn)
-  * Internal function definitions
-  */
- 
--static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen);
-+static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL);
- 
- /*
-  * Internal functions
-@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
- 
- void xorg_flush(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-     PixmapPtr pixmap = NULL;
-@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen)
-     free(pixmaps);
- }
- 
--static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
--                              pointer pReadmask)
-+static void drv_block_handler(BLOCKHANDLER_ARGS_DECL)
- {
--    ScreenPtr pScreen = screenInfo.screens[i];
--    modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]);
-+    SCREEN_PTR(arg);
-+    modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
- 
-     vmwgfx_swap(ms, pScreen, BlockHandler);
--    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
-+    pScreen->BlockHandler(BLOCKHANDLER_ARGS);
-     vmwgfx_swap(ms, pScreen, BlockHandler);
- 
-     vmwgfx_flush_dri2(pScreen);
-@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
- static Bool
- drv_create_screen_resources(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     Bool ret;
- 
-@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen)
-     if (!ret)
- 	return ret;
- 
--    drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+    drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
- 
--    return drv_enter_vt(pScreen->myNum, 1);
-+    return drv_enter_vt(VT_FUNC_ARGS);
- }
- 
- static Bool
-@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn)
- static Bool
- vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
- {
--    ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
-     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
-     modesettingPtr ms = modesettingPTR(pScrn);
-@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
- static Bool
- vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
- {
--    ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
-     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
-     modesettingPtr ms = modesettingPTR(pScrn);
-@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors,
- 
- 
- static Bool
--drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+drv_screen_init(SCREEN_INIT_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     VisualPtr visual;
- 
-@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
- 
- static void
--drv_adjust_frame(int scrnIndex, int x, int y, int flags)
-+drv_adjust_frame(ADJUST_FRAME_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86OutputPtr output = config->output[config->compat_output];
-     xf86CrtcPtr crtc = output->crtc;
-@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags)
- }
- 
- static void
--drv_free_screen(int scrnIndex, int flags)
-+drv_free_screen(FREE_SCREEN_ARGS_DECL)
- {
--    drv_free_rec(xf86Screens[scrnIndex]);
-+    SCRN_INFO_PTR(arg);
-+    drv_free_rec(pScrn);
- }
- 
- static void
--drv_leave_vt(int scrnIndex, int flags)
-+drv_leave_vt(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     modesettingPtr ms = modesettingPTR(pScrn);
- 
-     vmwgfx_cursor_bypass(ms->fd, 0, 0);
-@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags)
-  * This gets called when gaining control of the VT, and from ScreenInit().
-  */
- static Bool
--drv_enter_vt(int scrnIndex, int flags)
-+drv_enter_vt(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
- 
-     if (!drv_set_master(pScrn))
- 	return FALSE;
-@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags)
- }
- 
- static Bool
--drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags)
-+drv_switch_mode(SWITCH_MODE_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
- 
-     return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
- }
- 
- static Bool
--drv_close_screen(int scrnIndex, ScreenPtr pScreen)
-+drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
- 
-     if (ms->cursor) {
-@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
- 	xorg_dri2_close(pScreen);
- 
-     if (pScrn->vtSema)
--	pScrn->LeaveVT(scrnIndex, 0);
-+        pScrn->LeaveVT(VT_FUNC_ARGS);
- 
-     pScrn->vtSema = FALSE;
- 
-@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
-     if (ms->xat)
- 	xa_tracker_destroy(ms->xat);
- 
--    return (*pScreen->CloseScreen) (scrnIndex, pScreen);
-+    return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
- }
- 
- static ModeStatus
--drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-+drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
- {
-     return MODE_OK;
- }
-diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
-index 4fcfed6..f78a85f 100644
---- a/vmwgfx/vmwgfx_driver.h
-+++ b/vmwgfx/vmwgfx_driver.h
-@@ -46,6 +46,7 @@
- #include <xa_tracker.h>
- #include <xf86Module.h>
- 
-+#include "../src/compat-api.h"
- #ifdef DRI2
- #include <dri2.h>
- #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3))
-@@ -118,9 +119,9 @@ typedef struct _modesettingRec
-     ScreenBlockHandlerProcPtr saved_BlockHandler;
-     CreateScreenResourcesProcPtr saved_CreateScreenResources;
-     CloseScreenProcPtr saved_CloseScreen;
--    Bool (*saved_EnterVT)(int, int);
--    void (*saved_LeaveVT)(int, int);
--    void (*saved_AdjustFrame)(int, int, int, int);
-+    Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL);
-+    void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL);
-+    void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL);
-     Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr);
-     Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr);
- 
-diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
-index 469598a..63df3a1 100644
---- a/vmwgfx/vmwgfx_saa.c
-+++ b/vmwgfx/vmwgfx_saa.c
-@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen)
-     struct vmwgfx_saa *vsaa =
- 	to_vmwgfx_saa(saa_get_driver(pScreen));
-     struct _WsbmListHead *list, *next;
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- 
-     if (!pScrn->vtSema)
- 	return;
-@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver,
-     struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
-     struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap);
-     struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix);
--    ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen);
- 
-     /*
-      * Make dri2 drawables up to date, or add them to the flush list
-diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
-index af53379..449266b 100644
---- a/vmwgfx/vmwgfx_tex_video.c
-+++ b/vmwgfx/vmwgfx_tex_video.c
-@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn,
-           DrawablePtr pDraw)
- {
-    struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data;
--   ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+   ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
-    PixmapPtr pPixmap;
-    INT32 x1, x2, y1, y2;
-    BoxRec dstBox;
-@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports)
- static XF86VideoAdaptorPtr
- xorg_setup_textured_adapter(ScreenPtr pScreen)
- {
--   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+   ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-    modesettingPtr ms = modesettingPTR(pScrn);
-    XF86VideoAdaptorPtr adapt;
-    XF86AttributePtr attrs;
-@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen)
- void
- xorg_xv_init(ScreenPtr pScreen)
- {
--   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+   ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-    modesettingPtr ms = modesettingPTR(pScrn);
-    XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL;
-    XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL;
---
-cgit v0.9.0.2-2-gbebe
-From 50c01998c7800bc02fd6656cc14efa715bf63e08 Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarvatt@ubuntu.com>
-Date: Fri, 15 Jun 2012 15:56:59 +0000
-Subject: vmware: Fix up some warnings after new compat API change.
-
-Fixes multiple instances of these warnings on x86_64:
-../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration]
-../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs]
-../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default]
-Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/src/vmware.h b/src/vmware.h
-index 4818e16..be113bb 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -18,6 +18,7 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
-+#include "compat-api.h"
- 
- #include <X11/extensions/panoramiXproto.h>
- 
---
-cgit v0.9.0.2-2-gbebe
-From 46c0862d205eefa985e36a74391ca392640cb898 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Sat, 16 Jun 2012 13:43:52 +0000
-Subject: vmware: drop infoFromScreen inline in favour of new interface
-
-This also should fix the build regression introduced with the fix
-for this macro.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/vmware.h b/src/vmware.h
-index be113bb..028dff3 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -18,8 +18,6 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
--#include "compat-api.h"
--
- #include <X11/extensions/panoramiXproto.h>
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -177,10 +175,6 @@ typedef struct {
- 
- #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
- 
--static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
--    return xf86ScreenToScrn(s);
--}
--
- #define MIN(a,b) ((a)<(b)?(a):(b))
- #define MAX(a,b) ((a)>(b)?(a):(b))
- #define ABS(x) (((x) >= 0) ? (x) : -(x))
-diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
-index 2e2effb..93dacc0 100644
---- a/src/vmwarecurs.c
-+++ b/src/vmwarecurs.c
-@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] =
- #endif
- 
- #include "vmware.h"
-+#include "vmware_common.h"
- #include "bits2pixels.h"
- 
- static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
-@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
- static Bool
- vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n",
-               pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
-@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src )
- static Bool
- vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt %i\n",
-               pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
-@@ -283,7 +284,7 @@ Bool
- vmwareCursorInit(ScreenPtr pScreen)
- {
-     xf86CursorInfoPtr infoPtr;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
-     Bool ret;
- 
-     TRACEPOINT
-@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen)
- void
- vmwareCursorCloseScreen(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- #ifdef RENDER
-     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen)
- void
- vmwareCursorHookWrappers(ScreenPtr pScreen)
- {
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
- #ifdef RENDER
-     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
- #endif
-@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
-                unsigned int format, unsigned long planeMask, char *pBinImage)
- {
-     ScreenPtr pScreen = src->pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen));
-     BoxRec box;
-     Bool hidden = FALSE;
-     
-@@ -412,7 +413,7 @@ static void
- VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
- {
-     ScreenPtr pScreen = pWin->drawable.pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen));
-     BoxPtr pBB;
-     Bool hidden = FALSE;
-     
-@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
- 		CARD16 width, CARD16 height)
- {
-     ScreenPtr pScreen = pDst->pDrawable->pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
-     BoxRec box;
-     Bool hidden = FALSE;
-diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
-index 71f21fe..745c71f 100644
---- a/src/vmwarevideo.c
-+++ b/src/vmwarevideo.c
-@@ -39,6 +39,7 @@
- #endif
- 
- #include "vmware.h"
-+#include "vmware_common.h"
- #include "xf86xv.h"
- #include "fourcc.h"
- #include "svga_escape.h"
-@@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE)
- Bool
- vmwareVideoInit(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL;
-     XF86VideoAdaptorPtr newAdaptor = NULL;
-     int numAdaptors;
-@@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen)
- void
- vmwareVideoEnd(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VMWAREVideoPtr pVid;
-     int i;
---
-cgit v0.9.0.2-2-gbebe
-From e5ac80d8f72963313358e31cfb1ab98583e26f23 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 03 Jul 2012 12:50:30 +0000
-Subject: vmware: avoid warnings about shadowing 'i'
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 6bc946f..205ac59 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -46,7 +46,7 @@
- #define SCREEN_ARG_TYPE int
- #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
- 
--#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv
- 
- #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
---
-cgit v0.9.0.2-2-gbebe
-From 007bed30270ca9548dfe6e359972b56cbb8e2f13 Mon Sep 17 00:00:00 2001
-From: Jakob Bornecrantz <jakob@vmware.com>
-Date: Tue, 29 May 2012 21:01:14 +0000
-Subject: vmwgfx: Guard against null rotate pixmap in shadow destroy
-
-Reviewed-by: Thomas Hellström <thellstrom@vmware.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c
-index eaf87b2..fec04c0 100644
---- a/vmwgfx/vmwgfx_crtc.c
-+++ b/vmwgfx/vmwgfx_crtc.c
-@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
- static void
- crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
- {
--    ScreenPtr pScreen = rotate_pixmap->drawable.pScreen;
-+    ScreenPtr pScreen;
- 
-+    if (rotate_pixmap == NULL)
-+        return;
-+
-+    pScreen = rotate_pixmap->drawable.pScreen;
-     pScreen->DestroyPixmap(rotate_pixmap);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-voodoo/PKGBUILD b/testing/xf86-video-voodoo/PKGBUILD
deleted file mode 100644
index a3330b479..000000000
--- a/testing/xf86-video-voodoo/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168248 2012-10-06 20:08:51Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-voodoo
-pkgver=1.2.5
-pkgrel=2
-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' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8')
-
-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}/LICENSE"
-}
diff --git a/testing/xfce4-session/PKGBUILD b/testing/xfce4-session/PKGBUILD
deleted file mode 100644
index 70e3be6f8..000000000
--- a/testing/xfce4-session/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 169288 2012-10-18 19:49:18Z jgc $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfce4-session
-pkgver=4.10.0
-pkgrel=6
-pkgdesc="A session manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit'
-          'hicolor-icon-theme')
-makedepends=('intltool' 'xfce4-dev-tools')
-optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled'
-            'xscreensaver: for locking screen with xflock4'
-            'gnome-screensaver: for locking screen with xflock4'
-            'xlockmore: for locking screen with xflock4')
-replaces=('xfce-utils')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-session-4.10.0-add-systemd-support.patch)
-sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce'
-            'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8729
-  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch"
-
-  xdt-autogen
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/testing/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
deleted file mode 100644
index 7ab637b26..000000000
--- a/testing/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
-index 4076586..90e7873 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.c
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include <config.h>
-+
-+#include <gio/gio.h>
-+#include <polkit/polkit.h>
-+
-+#include "xfsm-systemd.h"
-+
-+#define SYSTEMD_DBUS_NAME       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE  "org.freedesktop.login1.Manager"
-+#define SYSTEMD_REBOOT_ACTION   "org.freedesktop.login1.reboot"
-+#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off"
-+
-+struct _SystemdProxy {
-+        PolkitAuthority *authority;
-+        PolkitSubject *subject;
-+};
-+
-+SystemdProxy *
-+systemd_proxy_new (void)
-+{
-+        SystemdProxy *proxy;
-+
-+        proxy = g_new0 (SystemdProxy, 1);
-+
-+        proxy->authority = polkit_authority_get_sync (NULL, NULL);
-+        proxy->subject = polkit_unix_process_new (getpid());
-+
-+        return proxy;
-+}
-+
-+void
-+systemd_proxy_free (SystemdProxy *proxy)
-+{
-+        g_object_unref (proxy->authority);
-+        g_object_unref (proxy->subject);
-+
-+        g_free (proxy);
-+}
-+
-+gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error)
-+{
-+        PolkitAuthorizationResult *res;
-+        GError *local_error = NULL;
-+
-+        *can_method = FALSE;
-+        res = polkit_authority_check_authorization_sync (proxy->authority,
-+                                                         proxy->subject,
-+                                                         method,
-+                                                         NULL,
-+                                                         POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
-+                                                         NULL,
-+                                                         &local_error);
-+        if (res == NULL) {
-+                g_propagate_error (error, local_error);
-+                return FALSE;
-+        }
-+
-+        *can_method = polkit_authorization_result_get_is_authorized (res) ||
-+                       polkit_authorization_result_get_is_challenge (res);
-+
-+        g_object_unref (res);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error)
-+{
-+        GDBusConnection *bus;
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+        g_dbus_connection_call_sync (bus,
-+                                     SYSTEMD_DBUS_NAME,
-+                                     SYSTEMD_DBUS_PATH,
-+                                     SYSTEMD_DBUS_INTERFACE,
-+                                     method,
-+                                     g_variant_new ("(b)", TRUE),
-+                                     NULL, 0, G_MAXINT, NULL, NULL);
-+        g_object_unref (bus);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "Reboot", error);
-+}
-+
-+gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "PowerOff", error);
-+}
-diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
-index 3fa8317..2c4d868 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.h
-@@ -0,0 +1,42 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __SYSTEMD_PROXY_H__
-+#define __SYSTEMD_PROXY_H__
-+
-+#include <glib.h>
-+
-+G_BEGIN_DECLS
-+
-+typedef struct _SystemdProxy SystemdProxy;
-+
-+SystemdProxy *systemd_proxy_new (void);
-+void          systemd_proxy_free (SystemdProxy *proxy);
-+gboolean      systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error);
-+gboolean      systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error);
-+gboolean      systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error);
-+gboolean      systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error);
-+gboolean      systemd_proxy_restart (SystemdProxy *proxy, GError **error);
-+gboolean      systemd_proxy_shutdown (SystemdProxy *proxy, GError **error);
-+
-+G_END_DECLS
-+
-+#endif  /* __SYSTEMD_PROXY_H__ */
-
-commit 518a28c23f110617aad36e64c02cdab6a36adf37
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:21:14 2012 +0200
-
-    ...
-
-diff --git a/configure.in.in b/configure.in.in
-index 9aa4f8f..aa0b8bb 100644
---- a/configure.in
-+++ b/configure.in
-@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
- XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
- 
-+dnl systemd integration
-+AC_ARG_ENABLE([systemd],
-+              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-+              [with_systemd=$enableval],
-+              [with_systemd=auto])
-+PKG_CHECK_MODULES(SYSTEMD,
-+                  [libsystemd-login polkit-gobject-1],
-+                  [have_systemd=yes], [have_systemd=no])
-+AC_MSG_CHECKING([whether to use systemd])
-+if test x$with_systemd = xauto ; then
-+        if test x$have_systemd = xno ; then
-+                with_systemd=no
-+        else
-+                with_systemd=yes
-+        fi
-+fi
-+AC_MSG_RESULT($with_systemd)
-+if test x$with_systemd = xyes; then
-+        if test x$have_systemd = xno; then
-+                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
-+        fi
-+        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-+fi
-+AC_SUBST(SYSTEMD_CFLAGS)
-+AC_SUBST(SYSTEMD_LIBS)
-+AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
-+
- dnl Check for debugging support
- XDT_FEATURE_DEBUG([xfsm_debug_default])
- 
-
-commit f1279eba9452f027a2037be77388767437161d51
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:18:16 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index 1429abd..077cdf3 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -96,7 +96,11 @@ struct _XfsmShutdown
- {
-   GObject __parent__;
- 
-+#ifdef HAVE_SYSTEMD
-+  SystemdProxy   *systemd_proxy;
-+#else
-   XfsmConsolekit *consolekit;
-+#endif
-   XfsmUPower     *upower;
- 
-   /* kiosk settings */
-@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
- {
-   XfceKiosk *kiosk;
- 
-+#ifdef HAVE_SYSTEMD
-+  shutdown->systemd_proxy = systemd_proxy_new ();
-+#else
-   shutdown->consolekit = xfsm_consolekit_get ();
-+#endif
-   shutdown->upower = xfsm_upower_get ();
-   shutdown->helper_state = SUDO_NOT_INITIAZED;
-   shutdown->helper_require_password = FALSE;
-@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object)
- {
-   XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
- 
-+#ifdef HAVE_SYSTEMD
-+  systemd_proxy_free (shutdown->systemd_proxy);
-+#else
-   g_object_unref (G_OBJECT (shutdown->consolekit));
-+#endif
-   g_object_unref (G_OBJECT (shutdown->upower));
- 
-   /* close down helper */
-@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_restart (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_restart (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_shutdown (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error))
-+#else
-   if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error))
-+#else
-   if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-
-commit 5aea3fb853683246a537a67423cf5b32076b8dfb
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:03:27 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
-index c015154..7e3b311 100644
---- a/xfce4-session/Makefile.am
-+++ b/xfce4-session/Makefile.am
-@@ -38,8 +38,6 @@ xfce4_session_SOURCES =							\
- 	xfsm-compat-gnome.h						\
- 	xfsm-compat-kde.c						\
- 	xfsm-compat-kde.h						\
--	xfsm-consolekit.c						\
--	xfsm-consolekit.h						\
- 	xfsm-dns.c							\
- 	xfsm-dns.h							\
- 	xfsm-error.c							\
-@@ -65,6 +63,16 @@ xfce4_session_SOURCES =							\
- 	xfsm-upower.c							\
- 	xfsm-upower.h
- 
-+if WITH_SYSTEMD
-+xfce4_session_SOURCES +=						\
-+	xfsm-systemd.c							\
-+	xfsm-systemd.h
-+else
-+xfce4_session_SOURCES +=						\
-+	xfsm-consolekit.c						\
-+	xfsm-consolekit.h
-+endif
-+
- xfce4_session_CFLAGS =							\
- 	$(LIBSM_CFLAGS)							\
- 	$(LIBX11_CFLAGS)						\
-@@ -72,6 +80,7 @@ xfce4_session_CFLAGS =							\
- 	$(DBUS_CFLAGS)							\
- 	$(DBUS_GLIB_CFLAGS)						\
- 	$(LIBWNCK_CFLAGS)						\
-+	$(SYSTEMD_CFLAGS)						\
- 	$(XFCONF_CFLAGS)						\
- 	$(GMODULE_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
-@@ -91,6 +100,7 @@ xfce4_session_LDADD =							\
- 	$(DBUS_LIBS)							\
- 	$(DBUS_GLIB_LIBS)						\
- 	$(LIBWNCK_LIBS)							\
-+	$(SYSTEMD_LIBS)							\
- 	$(XFCONF_LIBS)							\
- 	-lm
- 
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index d8757a8..1429abd 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -66,10 +66,13 @@
- #include <xfce4-session/xfsm-fadeout.h>
- #include <xfce4-session/xfsm-global.h>
- #include <xfce4-session/xfsm-legacy.h>
--#include <xfce4-session/xfsm-consolekit.h>
- #include <xfce4-session/xfsm-upower.h>
- 
--
-+#ifdef HAVE_SYSTEMD
-+#include <xfce4-session/xfsm-systemd.h>
-+#else
-+#include <xfce4-session/xfsm-consolekit.h>
-+#endif
- 
- static void xfsm_shutdown_finalize  (GObject      *object);
- static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
diff --git a/testing/xfce4-session/xfce4-session.install b/testing/xfce4-session/xfce4-session.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/testing/xfce4-session/xfce4-session.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD
deleted file mode 100644
index 6a9f18c0f..000000000
--- a/testing/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 169650 2012-10-25 01:35:46Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.2.2
-pkgrel=3
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'ffmpeg' 'libxinerama')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
-             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu')
-optdepends=('imagemagick: for using the imagemagick plugin' \
-            'jack: for using the jack plugin' \
-            'vcdimager: for using the vcd plugin' \
-            'glu: for using the opengl plugin' \
-            'wavpack: for using the wavpack plugin' \
-            'faad2: for using the faad plugin' \
-            'libmng: for using the mng plugin' \
-            'aalib: for using the aalib plugin' \
-            'libmodplug: for using the modplug plugin' \
-            'libdca: for using the dca plugin' \
-            'a52dec: for using the a52 plugin' \
-            'libmad: for using the mp3 plugin' \
-            'libmpcdec: for using the musepack plugin' \
-            'libcaca: for using the caca plugin' \
-            'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin' \
-            'libvdpau: for using the VDPAU plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/xinetd/PKGBUILD b/testing/xinetd/PKGBUILD
deleted file mode 100644
index 3f9dfa4f1..000000000
--- a/testing/xinetd/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 161606 2012-06-12 07:21:42Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=xinetd
-pkgver=2.3.15
-pkgrel=2
-pkgdesc="A secure replacement for inetd"
-arch=('i686' 'x86_64')
-url="http://www.xinetd.org/"
-license=('custom')
-optdepends=('perl: for xconv.pl script')
-backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services')
-source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
-        xinetd.conf
-        xinetd
-        servers
-        services
-        xinetd.service)
-md5sums=('77358478fd58efa6366accae99b8b04c'
-         'f109f699a07bc8cfb5791060f5e87f9e'
-         'ea37a2794f202e6b953d9b6956dad16a'
-         '21f47b4aa20921cfaddddd9f9a407f81'
-         '9fa2061dc7dd738c8424251deb86f81e'
-         '08466ed714ea8ba42ad81f6fb3aa62e7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i "s#${prefix}/man#${prefix}/share/man#" configure
-  ./configure --prefix=/usr --without-libwrap
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-  
-  install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd
-  install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf
-  install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
-  install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
-
-  # install systemd files
-  install -Dm644 $srcdir/xinetd.service $pkgdir/usr/lib/systemd/system/xinetd.service
-  # install license
-  install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
-}
diff --git a/testing/xinetd/servers b/testing/xinetd/servers
deleted file mode 100644
index f064c8d7a..000000000
--- a/testing/xinetd/servers
+++ /dev/null
@@ -1,10 +0,0 @@
-service servers
-{
-        type            = INTERNAL UNLISTED
-        port            = 9099
-        socket_type     = stream
-        protocol        = tcp
-        wait            = no
-        disable         = yes
-        only_from       = 127.0.0.1
-}
diff --git a/testing/xinetd/services b/testing/xinetd/services
deleted file mode 100644
index 4ea304c4f..000000000
--- a/testing/xinetd/services
+++ /dev/null
@@ -1,10 +0,0 @@
-service services
-{
-        type            = INTERNAL UNLISTED
-        port            = 9098
-        socket_type     = stream
-        protocol        = tcp
-        wait            = no
-        disable         = yes
-        only_from       = 127.0.0.1
-}
diff --git a/testing/xinetd/xinetd b/testing/xinetd/xinetd
deleted file mode 100755
index 4b8fa369a..000000000
--- a/testing/xinetd/xinetd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/xinetd`
-case "$1" in
-  start)
-    stat_busy "Starting xinetd"
-    [ -z "$PID" ] && /usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/xinetd.pid
-      add_daemon xinetd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping xinetd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/xinetd.pid
-      rm_daemon xinetd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/xinetd/xinetd.conf b/testing/xinetd/xinetd.conf
deleted file mode 100644
index b15d9f649..000000000
--- a/testing/xinetd/xinetd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# /etc/xinetd.conf
-#
-
-defaults
-{
-        instances               = 60
-        log_type                = SYSLOG authpriv
-        log_on_success          = HOST PID
-        log_on_failure          = HOST
-        cps                     = 25 30
-}
-
-includedir /etc/xinetd.d
diff --git a/testing/xinetd/xinetd.service b/testing/xinetd/xinetd.service
deleted file mode 100644
index c6f6271fd..000000000
--- a/testing/xinetd/xinetd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=A secure replacement for inetd
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/xinetd -dontfork
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch b/testing/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch
deleted file mode 100644
index e3e42d410..000000000
--- a/testing/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 29d84d5a7ca4cc12cce47de9313adeb8554fb894 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 18 Oct 2012 15:11:31 +1000
-Subject: [PATCH] dix: fix zaphod screen scrossing (#54654)
-
-POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the
-coordinates after a screen crossing are already relative to the new screen's
-origin. Add that offset to the coordinates before re-setting.
-
-regression introduced by
-commit bafbd99080be49a17be97d2cc758fbe623369945
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Aug 8 11:34:32 2012 +1000
-
-    dix: work around scaling issues during WarpPointer (#53037)
-
-X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/getevents.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 71d83c4..8b4379d 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-        coordinates were.
-      */
-     if (flags & POINTER_SCREEN) {
--        screenx = sx;
--        screeny = sy;
-+        scr = miPointerGetScreen(pDev);
-+        screenx = sx + scr->x;
-+        screeny = sy + scr->y;
-     }
- 
-     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
--- 
-1.7.11.7
-
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 018b1a3e4..000000000
--- a/testing/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,201 +0,0 @@
-# $Id: PKGBUILD 169328 2012-10-19 14:01:21Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=xorg-server
-pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.0
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
-             'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
-             'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
-             'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt')
-options=('!libtool')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        autoconfig-nvidia.patch
-        autoconfig-sis.patch
-        xvfb-run
-        xvfb-run.1
-        10-quirks.conf
-        0001-dix-fix-zaphod-screen-scrossing-54654.patch)
-sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a'
-            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
-            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-            '23861814b4283ca3fe43aae6e88ee82bcbae5713bf88eabeaef7beb94efe9707')
-
-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"
-
-  # https://bugs.archlinux.org/task/31959 / https://bugs.freedesktop.org/show_bug.cgi?id=54654
-  patch -Np1 -i ${srcdir}/0001-dix-fix-zaphod-screen-scrossing-54654.patch
-
-  autoreconf -fi
-  ./configure --prefix=/usr \
-      --enable-ipv6 \
-      --enable-dri \
-      --enable-dmx \
-      --enable-xvfb \
-      --enable-xnest \
-      --enable-composite \
-      --enable-xcsecurity \
-      --enable-xorg \
-      --enable-xephyr \
-      --enable-glx-tls \
-      --enable-kdrive \
-      --enable-kdrive-evdev \
-      --enable-kdrive-kbd \
-      --enable-kdrive-mouse \
-      --enable-install-setuid \
-      --enable-config-udev \
-      --disable-config-dbus \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --sysconfdir=/etc/X11 \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -i hw/Makefile
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev)
-  backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
-  # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
-  provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
-  groups=('xorg')
-  conflicts=('nvidia-utils<=290.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11"
-  mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/"
-  install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  rmdir "${pkgdir}/usr/share/X11"
-
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
-           xproto randrproto renderproto xextproto inputproto kbproto 
-           fontsproto pixman videoproto xf86driproto glproto 
-           mesa dri2proto xineramaproto libpciaccess
-           # not technically required but almost every Xorg pkg needs it to build
-           xorg-util-macros)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}
diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch
deleted file mode 100644
index 6d5220ac7..000000000
--- a/testing/xorg-server/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1144,7 +1144,23 @@
-         int idx = 0;
- 
- #ifdef __linux__
--        driverList[idx++] = "nouveau";
-+	    switch (dev->device_id)
-+		{
-+		/* NV1 */
-+		case 0x0008:
-+		case 0x0009:
-+		    driverList[idx++] = "vesa";
-+		    break;
-+		/* NV3 */
-+		case 0x0018:
-+		case 0x0019:
-+		    driverList[idx++] = "nouveau";
-+		    break;
-+		default:
-+		    driverList[idx++] = "nouveau";
-+		    driverList[idx++] = "nvidia";
-+		    break;
-+		}
- #endif
-         driverList[idx++] = "nv";
-         break;
diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index 0b50049db..000000000
--- a/testing/xorg-server/autoconfig-sis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
-+++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
-@@ -1200,9 +1200,15 @@
-             break;
-         }
-         break;
--    case 0x1039:
--        driverList[0] = "sis";
--        break;
-+	case 0x1039:
-+	    switch (dev->device_id)
-+	    {
-+		case 0x6350: case 0x6351:
-+		    driverList[0] = "sisimedia"; driverList[1] = "sis"; break;
-+		default:
-+		    driverList[0] = "sis"; break;
-+	    }
-+	    break;
-     case 0x126f:
-         driverList[0] = "siliconmotion";
-         break;
diff --git a/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/PKGBUILD b/testing/xorg-xdm/PKGBUILD
deleted file mode 100644
index 5a2ce0012..000000000
--- a/testing/xorg-xdm/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 169289 2012-10-18 19:49:22Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-xdm
-pkgver=1.1.11
-pkgrel=4
-pkgdesc="X Display Manager"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd')
-makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans')
-backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
-options=('!libtool')
-source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
-        Xsession-loginshell.patch
-        Xsession-xsm.patch
-        xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
-        xdm.pam
-        git_fixes.diff)
-sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
-            'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
-            '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
-            '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418'
-            '781b5577bb070220d018a11832d0d4a65fd16e130730ba26fb055c3aa68156b2')
-
-build() {
-  cd "${srcdir}/xdm-${pkgver}"
-  # upstream commits - Add some missing malloc failure checks 	2012-01-07
-  patch -Np1 -i "${srcdir}/git_fixes.diff"
-  
-  patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
-  patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
-  patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
-
-  autoreconf -fi
-  ./configure --prefix=/usr \
-      --disable-xdm-auth \
-      --disable-static \
-      --with-xdmconfigdir=/etc/X11/xdm \
-      --with-xdmscriptdir=/etc/X11/xdm \
-      --with-pixmapdir=/usr/share/xdm/pixmaps
-  make
-}
-
-package() {
-  cd "${srcdir}/xdm-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/var/lib/xdm"
-  install -m755 -d "${pkgdir}/etc/pam.d"
-  install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/*
-
-  sed -i 's|^Alias=.*|Alias=display-manager.service|' \
-    "$pkgdir/usr/lib/systemd/system/xdm.service"
-}
diff --git a/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/git_fixes.diff b/testing/xorg-xdm/git_fixes.diff
deleted file mode 100644
index 69836d488..000000000
--- a/testing/xorg-xdm/git_fixes.diff
+++ /dev/null
@@ -1,673 +0,0 @@
-From 011a2710a69cd345a8ee3a6b2f15407b4c3b355a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sun, 25 Sep 2011 07:56:15 +0000
-Subject: Require xt >= 1.0 for appdefaultdir
-
-https://bugs.freedesktop.org/show_bug.cgi?id=7237
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/configure.ac b/configure.ac
-index b488f0c..a4222f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,7 +383,7 @@ PKG_CHECK_MODULES(AUTH, xau)
- # Greeter
- #
- 
--PKG_CHECK_MODULES(XDMGREET, xt x11 xext)
-+PKG_CHECK_MODULES(XDMGREET, xt >= 1.0 x11 xext)
- 
- GREETERLIB="${XDMLIBDIR}/libXdmGreet.so"
- AX_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library])
---
-cgit v0.9.0.2-2-gbebe
-From 618039261b0c7f14eb3b32c8f636464369724407 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 21 Sep 2011 02:11:20 +0000
-Subject: Mark some chars as const to fix gcc -Wwrite-strings warnings
-
-Can't fix all the warnings, due to the Xt API, but can fix a bunch.
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/greeter/greet.c b/greeter/greet.c
-index 539ce17..82e2c21 100644
---- a/greeter/greet.c
-+++ b/greeter/greet.c
-@@ -110,9 +110,9 @@ void    (*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NU
- void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL;
- int     (*__xdm_source)(char **environ, char *file) = NULL;
- char    **(*__xdm_defaultEnv)(void) = NULL;
--char    **(*__xdm_setEnv)(char **e, char *name, char *value) = NULL;
-+char    **(*__xdm_setEnv)(char **e, const char *name, const char *value) = NULL;
- char    **(*__xdm_putEnv)(const char *string, char **env) = NULL;
--char    **(*__xdm_parseArgs)(char **argv, char *string) = NULL;
-+char    **(*__xdm_parseArgs)(char **argv, const char *string) = NULL;
- void    (*__xdm_printEnv)(char **e) = NULL;
- char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL;
- void    (*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL;
-diff --git a/greeter/verify.c b/greeter/verify.c
-index ea62cd2..5d2ad17 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -61,7 +61,7 @@ from The Open Group.
- extern char *crypt(const char *, const char *);
- #endif
- 
--static char *envvars[] = {
-+static const char *envvars[] = {
-     "TZ",			/* SYSV and SVR4, but never hurts */
- #if defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)
-     "bootdev",
-@@ -94,8 +94,8 @@ static char **
- userEnv (struct display *d, int useSystemPath, char *user, char *home, char *shell)
- {
-     char	**env;
--    char	**envvar;
--    char	*str;
-+    const char	**envvar;
-+    const char	*str;
- 
-     env = defaultEnv ();
-     env = setEnv (env, "DISPLAY", d->name);
-diff --git a/include/dm.h b/include/dm.h
-index 316dd46..4085cae 100644
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -443,7 +443,7 @@ extern void UnsecureDisplay (struct display *d, Display *dpy);
- extern void execute(char **argv, char **environ);
- 
- /* server.c */
--extern char *_SysErrorMsg (int n);
-+extern const char *_SysErrorMsg (int n);
- extern int StartServer (struct display *d);
- extern int WaitForServer (struct display *d);
- extern void ResetServer (struct display *d);
-@@ -462,10 +462,10 @@ extern int Asprintf(char ** ret, const char *restrict format, ...)
-     _X_ATTRIBUTE_PRINTF(2,3);
- # endif
- extern char *localHostname (void);
--extern char **parseArgs (char **argv, char *string);
--extern char **setEnv (char **e, char *name, char *value);
-+extern char **parseArgs (char **argv, const char *string);
-+extern char **setEnv (char **e, const char *name, const char *value);
- extern char **putEnv(const char *string, char **env);
--extern char *getEnv (char **e, char *name);
-+extern char *getEnv (char **e, const char *name);
- extern void CleanUpChild (void);
- extern void freeArgs (char **argv);
- extern void freeEnv (char **env);
-@@ -478,7 +478,7 @@ extern int Verify (struct display *d, struct greet_info *greet, struct verify_in
- extern char *NetworkAddressToHostname (CARD16 connectionType, ARRAY8Ptr connectionAddress);
- extern int AnyWellKnownSockets (void);
- extern void DestroyWellKnownSockets (void);
--extern void SendFailed (struct display *d, char *reason);
-+extern void SendFailed (struct display *d, const char *reason);
- extern void StopDisplay (struct display *d);
- extern void WaitForChild (void);
- extern void WaitForSomething (void);
-diff --git a/include/greet.h b/include/greet.h
-index 6b6689e..0d607ba 100644
---- a/include/greet.h
-+++ b/include/greet.h
-@@ -65,9 +65,9 @@ struct dlfuncs {
-     void (*_DeleteXloginResources)(struct display *d, Display *dpy);
-     int (*_source)(char **environ, char *file);
-     char **(*_defaultEnv)(void);
--    char **(*_setEnv)(char **e, char *name, char *value);
-+    char **(*_setEnv)(char **e, const char *name, const char *value);
-     char **(*_putEnv)(const char *string, char **env);
--    char **(*_parseArgs)(char **argv, char *string);
-+    char **(*_parseArgs)(char **argv, const char *string);
-     void (*_printEnv)(char **e);
-     char **(*_systemEnv)(struct display *d, char *user, char *home);
-     void (*_LogOutOfMem)(const char * fmt, ...);
-@@ -149,9 +149,9 @@ extern	void    (*__xdm_SessionExit)(struct display *d, int status, int removeAut
- extern	void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy);
- extern	int     (*__xdm_source)(char **environ, char *file);
- extern	char    **(*__xdm_defaultEnv)(void);
--extern	char    **(*__xdm_setEnv)(char **e, char *name, char *value);
-+extern	char    **(*__xdm_setEnv)(char **e, const char *name, const char *value);
- extern	char    **(*__xdm_putEnv)(const char *string, char **env);
--extern	char    **(*__xdm_parseArgs)(char **argv, char *string);
-+extern	char    **(*__xdm_parseArgs)(char **argv, const char *string);
- extern	void    (*__xdm_printEnv)(char **e);
- extern	char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home);
- extern	void    (*__xdm_LogOutOfMem)(const char * fmt, ...);
-diff --git a/xdm/access.c b/xdm/access.c
-index d0850ad..7035375 100644
---- a/xdm/access.c
-+++ b/xdm/access.c
-@@ -667,7 +667,7 @@ scanHostlist (
- /* Returns non-0 iff string is matched by pattern.  Does case folding.
-  */
- static int
--patternMatch (char *string, char *pattern)
-+patternMatch (const char *string, char *pattern)
- {
-     int	    p, s;
- 
-diff --git a/xdm/auth.c b/xdm/auth.c
-index bbca167..9e5cba2 100644
---- a/xdm/auth.c
-+++ b/xdm/auth.c
-@@ -116,7 +116,7 @@ int chown(int a,int b,int c) {}
- 
- struct AuthProtocol {
-     unsigned short  name_length;
--    char	    *name;
-+    const char	    *name;
-     void	    (*InitAuth)(unsigned short len, char *name);
-     Xauth	    *(*GetAuth)(unsigned short len, char *name);
-     void	    (*GetXdmcpAuth)(
-diff --git a/xdm/file.c b/xdm/file.c
-index 6e929b8..7b7f3d3 100644
---- a/xdm/file.c
-+++ b/xdm/file.c
-@@ -225,7 +225,7 @@ ParseDisplay (char *source, DisplayType *acceptableTypes, int numAcceptable)
- }
- 
- static struct displayMatch {
--	char		*name;
-+	const char	*name;
- 	DisplayType	type;
- } displayTypes[] = {
- 	{ "local",		{ Local, Permanent, FromFile } },
-diff --git a/xdm/resource.c b/xdm/resource.c
-index ece4de3..83901a2 100644
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -145,10 +145,10 @@ int	choiceTimeout;	/* chooser choice timeout */
- #define DEF_UDP_PORT	"177"	    /* registered XDMCP port, dont change */
- 
- struct dmResources {
--	char	*name, *class;
--	int	type;
--	char	**dm_value;
--	char	*default_value;
-+	const char	*name, *class;
-+	int		type;
-+	char		**dm_value;
-+	const char	*default_value;
- } DmResources[] = {
- { "servers",	"Servers", 	DM_STRING,	&servers,
- 				DEF_SERVER_LINE} ,
-@@ -203,10 +203,10 @@ struct dmResources {
- #define boffset(f)	XtOffsetOf(struct display, f)
- 
- struct displayResource {
--	char	*name, *class;
--	int	type;
--	int	offset;
--	char	*default_value;
-+	const char	*name, *class;
-+	int		type;
-+	int		offset;
-+	const char	*default_value;
- };
- 
- /* resources for managing the server */
-@@ -289,15 +289,16 @@ XrmDatabase	DmResourceDB;
- 
- static void
- GetResource (
--    char    *name,
--    char    *class,
--    int	    valueType,
--    char    **valuep,
--    char    *default_value)
-+    const char    *name,
-+    const char    *class,
-+    int            valueType,
-+    char         **valuep,
-+    const char    *default_value)
- {
-     char	*type;
-     XrmValue	value;
--    char	*string, *new_string;
-+    const char	*string;
-+    char	*new_string;
-     char	str_buf[50];
-     int	len;
- 
-diff --git a/xdm/server.c b/xdm/server.c
-index 7fe55e6..1bb8873 100644
---- a/xdm/server.c
-+++ b/xdm/server.c
-@@ -62,9 +62,9 @@ CatchUsr1 (int n)
-     errno = olderrno;
- }
- 
--char *_SysErrorMsg (int n)
-+const char *_SysErrorMsg (int n)
- {
--    char *s = strerror(n);
-+    const char *s = strerror(n);
-     return (s ? s : "unknown error");
- }
- 
-diff --git a/xdm/util.c b/xdm/util.c
-index 033633a..60aab21 100644
---- a/xdm/util.c
-+++ b/xdm/util.c
-@@ -97,7 +97,7 @@ printEnv (char **e)
- }
- 
- static char *
--makeEnv (char *name, char *value)
-+makeEnv (const char *name, const char *value)
- {
- 	char	*result;
- 
-@@ -111,7 +111,7 @@ makeEnv (char *name, char *value)
- }
- 
- char *
--getEnv (char **e, char *name)
-+getEnv (char **e, const char *name)
- {
- 	int	l = strlen (name);
- 
-@@ -127,7 +127,7 @@ getEnv (char **e, char *name)
- }
- 
- char **
--setEnv (char **e, char *name, char *value)
-+setEnv (char **e, const char *name, const char *value)
- {
- 	char	**new, **old;
- 	char	*newe;
-@@ -207,9 +207,9 @@ freeEnv (char **env)
- #define isblank(c)	((c) == ' ' || c == '\t')
- 
- char **
--parseArgs (char **argv, char *string)
-+parseArgs (char **argv, const char *string)
- {
--	char	*word;
-+	const char *word;
- 	char	*save;
- 	char    **newargv;
- 	int	i;
-diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
-index 4b945cf..66804a4 100644
---- a/xdm/xdmauth.c
-+++ b/xdm/xdmauth.c
-@@ -44,7 +44,7 @@ static char	auth_name[256];
- static int	auth_name_len;
- 
- static void
--XdmPrintDataHex (char *s, char *a, int l)
-+XdmPrintDataHex (const char *s, const char *a, int l)
- {
-     int	i;
- 
-@@ -56,7 +56,7 @@ XdmPrintDataHex (char *s, char *a, int l)
- 
- # ifdef XDMCP
- static void
--XdmPrintArray8Hex (char *s, ARRAY8Ptr a)
-+XdmPrintArray8Hex (const char *s, ARRAY8Ptr a)
- {
-     XdmPrintDataHex (s, (char *) a->data, a->length);
- }
-diff --git a/xdm/xdmcp.c b/xdm/xdmcp.c
-index 5bc4716..1c34e7c 100644
---- a/xdm/xdmcp.c
-+++ b/xdm/xdmcp.c
-@@ -74,7 +74,7 @@ static void request_respond (struct sockaddr *from, int fromlen, int length, int
- static void send_accept (struct sockaddr *to, int tolen, CARD32 sessionID, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr authorizationName, ARRAY8Ptr authorizationData, int fd);
- static void send_alive (struct sockaddr *from, int fromlen, int length, int fd);
- static void send_decline (struct sockaddr *to, int tolen, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr status, int fd);
--static void send_failed (struct sockaddr *from, int fromlen, char *name, CARD32 sessionID, char *reason, int fd);
-+static void send_failed (struct sockaddr *from, int fromlen, const char *name, CARD32 sessionID, const char *reason, int fd);
- static void send_refuse (struct sockaddr *from, int fromlen, CARD32 sessionID, int fd);
- static void send_unwilling (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
- static void send_willing (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
-@@ -1300,7 +1300,7 @@ abort:
- void
- SendFailed (
-     struct display  *d,
--    char	    *reason)
-+    const char	    *reason)
- {
-     Debug ("Display start failed, sending Failed\n");
-     send_failed ((struct sockaddr *)(d->from), d->fromlen, d->name,
-@@ -1311,9 +1311,9 @@ static void
- send_failed (
-     struct sockaddr *from,
-     int		    fromlen,
--    char	    *name,
-+    const char	    *name,
-     CARD32	    sessionID,
--    char	    *reason,
-+    const char	    *reason,
-     int		    fd)
- {
-     static char	buf[256];
-@@ -1416,7 +1416,7 @@ NetworkAddressToHostname (
- # else
- 	    char dotted[20];
- # endif
--	    char *local_name = "";
-+	    const char *local_name = "";
- 	    int af_type;
- 
- # if defined(IPv6) && defined(AF_INET6)
---
-cgit v0.9.0.2-2-gbebe
-From c43eb799774743bc50233eff6643c51a5fbe6899 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 21 Sep 2011 02:22:48 +0000
-Subject: Fix warnings about printing longs with int type format strings
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/xdm/dm.c b/xdm/dm.c
-index cd0ee25..7bc2605 100644
---- a/xdm/dm.c
-+++ b/xdm/dm.c
-@@ -536,7 +536,7 @@ WaitForChild (void)
- 		  time(&now);
- 		  crash = d->lastReserv &&
- 		    ((now - d->lastReserv) < XDM_BROKEN_INTERVAL);
--		  Debug("time %i %i try %i of %i%s\n", now, d->lastReserv,
-+		  Debug("time %li %li try %i of %i%s\n", now, d->lastReserv,
- 			d->reservTries, d->reservAttempts,
- 			crash ? " crash" : "");
- 
-diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
-index 66804a4..b3c1c16 100644
---- a/xdm/xdmauth.c
-+++ b/xdm/xdmauth.c
-@@ -234,7 +234,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARRAY8Ptr displayID)
- 	if (line[0] == '#' || sscanf (line, "%s %s", id, key) != 2)
- 	    continue;
- 	bzero(line, sizeof(line));
--	Debug ("Key entry for \"%s\" %d bytes\n", id, strlen(key));
-+	Debug ("Key entry for \"%s\" %ld bytes\n", id, strlen(key));
- 	if (strlen (id) == displayID->length &&
- 	    !strncmp (id, (char *)displayID->data, displayID->length))
- 	{
---
-cgit v0.9.0.2-2-gbebe
-From 8eee942be0db913511b4c53f94829e1201dfdf00 Mon Sep 17 00:00:00 2001
-From: Michał Górny <mgorny@gentoo.org>
-Date: Wed, 28 Sep 2011 19:25:17 +0000
-Subject: Support systemd startup notification.
-
-If libsystemd-daemon support is enabled, xdm uses it to announce its
-startup as soon as the session is established. This gives the user
-opportunity to delay I/O-intensive operations until the X server is
-started so that they would not interfere with its loading while keeping
-the machine busy when user types in his/her login.
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/Makefile.am b/Makefile.am
-index e5f9f5c..bb6b51c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,8 +43,13 @@ endif LINT
- if HAVE_SYSTEMD
- systemdsystemunit_DATA = xdm.service
- 
--xdm.service: xdm.service.in
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < $< > $@
-+xdm.service: xdm.service.in Makefile
-+if USE_SYSTEMD_DAEMON
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
-+else !USE_SYSTEMD_DAEMON
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
-+endif !USE_SYSTEMD_DAEMON
-+
- endif HAVE_SYSTEMD
- CLEANFILES = xdm.service
- EXTRA_DIST = xdm.service.in
-diff --git a/configure.ac b/configure.ac
-index a4222f1..fcb37f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,6 +146,7 @@ if test "x$USE_SELINUX" != "xno" ; then
- fi
- 
- # Check whether to install systemd unit files, as suggested in daemon(7).
-+# When a full path is specified, this does not require systemd installed.
- AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
- 	[Directory for systemd service files (default from the System and Service Manager)]),,
- 	[with_systemdsystemunitdir=auto])
-@@ -166,6 +167,21 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
- ])
- AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
- 
-+# Check whether to enable systemd startup notification.
-+# This requires libsystemd-daemon.
-+AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
-+	[Add support for systemd startup notification (default is autodetected)]),
-+	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
-+AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-+	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
-+	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
-+	)]
-+    )
-+])
-+AM_CONDITIONAL(USE_SYSTEMD_DAEMON, [test "x$USE_SYSTEMD_DAEMON" != "xno"])
-+
- # FIXME: Find better test for which OS'es use su -m  - for now, just try to
- # mirror the Imakefile setting of:
- # if  defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
-diff --git a/xdm.service.in b/xdm.service.in
-index d15e072..e782dd9 100644
---- a/xdm.service.in
-+++ b/xdm.service.in
-@@ -4,6 +4,8 @@ After=systemd-user-sessions.service
- 
- [Service]
- ExecStart=BINDIR/xdm -nodaemon
-+Type=notify
-+NotifyAccess=all
- 
- [Install]
- Alias=graphical.target.wants/xdm.service
-diff --git a/xdm/Makefile.am b/xdm/Makefile.am
-index aa9765c..797b5c5 100644
---- a/xdm/Makefile.am
-+++ b/xdm/Makefile.am
-@@ -22,11 +22,11 @@
- bin_PROGRAMS = xdm
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include
--AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS)
-+AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
- 
- # The xdm binary needs to export symbols so that they can be used from
- # libXdmGreet.so loaded through a dlopen call from session.c
--AM_LDFLAGS = $(XDM_LIBS) -export-dynamic
-+AM_LDFLAGS = $(XDM_LIBS) $(SYSTEMD_DAEMON_LIBS) -export-dynamic
- 
- xdm_SOURCES =		\
-         access.c	\
-diff --git a/xdm/session.c b/xdm/session.c
-index 5fd47f0..573747d 100644
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -81,6 +81,10 @@ extern int key_setnet(struct key_netstarg *arg);
- #  define RTLD_NOW 1
- # endif
- 
-+#ifdef USE_SYSTEMD_DAEMON
-+#include <systemd/sd-daemon.h>
-+#endif
-+
- #ifdef USE_SELINUX
- /* This should be run just before we exec the user session. */
- static int
-@@ -349,6 +353,12 @@ ManageSession (struct display *d)
- 	exit(UNMANAGE_DISPLAY);
- 	}
- 
-+#ifdef USE_SYSTEMD_DAEMON
-+	/* Subsequent notifications will be ignored by systemd
-+	 * and calling this function will clean up the env */
-+	sd_notify(1, "READY=1");
-+#endif
-+
-     /* tell the possibly dynamically loaded greeter function
-      * what data structure formats to expect.
-      * These version numbers are registered with The Open Group. */
---
-cgit v0.9.0.2-2-gbebe
-From 284532c0884893728b75ca37f5d2a9a33f7bc8db Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sat, 22 Oct 2011 15:14:46 +0000
-Subject: greeter: link against -lXrender if xft is enabled
-
-XmuCvtStringToXftColor uses XRenderParseColor, so require xrender for
-the xft option, and link against it.
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/configure.ac b/configure.ac
-index fcb37f8..d20ae28 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -345,10 +345,10 @@ AC_ARG_WITH(xft,
- 	AS_HELP_STRING([--with-xft],
- 			[Use Xft to draw text (default is YES if installed)]),
- 	[USE_XFT="$withval"],
--	PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]))
-+	PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"]))
- 
- if test "x$USE_XFT" = "xyes" ; then
--	PKG_CHECK_MODULES(XFT, xft)
-+	PKG_CHECK_MODULES(XFT, xft xrender)
- 	GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
- 	GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
- 	AC_DEFINE([USE_XFT], 1,
-diff --git a/greeter/Login.c b/greeter/Login.c
-index 99a3932..d899376 100644
---- a/greeter/Login.c
-+++ b/greeter/Login.c
-@@ -86,6 +86,10 @@ from The Open Group.
- # include <X11/extensions/Xinerama.h>
- #endif
- 
-+#ifdef USE_XFT
-+# include <X11/extensions/Xrender.h>
-+#endif
-+
- #ifndef DEBUG
- # define XDM_ASSERT(a)	/* do nothing */
- #else
---
-cgit v0.9.0.2-2-gbebe
-From a02edebf21aae37f8564d7b9fad01d5d2942ad8d Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Mon, 07 Nov 2011 16:01:44 +0000
-Subject: Fix build outside of source dir. Fixes distcheck too.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/Makefile.am b/Makefile.am
-index bb6b51c..e9da40f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -45,9 +45,9 @@ systemdsystemunit_DATA = xdm.service
- 
- xdm.service: xdm.service.in Makefile
- if USE_SYSTEMD_DAEMON
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < ${srcdir}/xdm.service.in > $@
- else !USE_SYSTEMD_DAEMON
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < ${srcdir}/xdm.service.in > $@
- endif !USE_SYSTEMD_DAEMON
- 
- endif HAVE_SYSTEMD
---
-cgit v0.9.0.2-2-gbebe
-From ad7a54288f62c0266540279dac775ebee68f092e Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Thu, 15 Dec 2011 21:14:23 +0000
-Subject: replace <varargs.h> by <stdarg.h>. Spotted my Marco Peereboom with clang.
-
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
----
-diff --git a/greeter/verify.c b/greeter/verify.c
-index 5d2ad17..1221874 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -48,7 +48,7 @@ from The Open Group.
- # include	<errno.h>
- #elif defined(USE_BSDAUTH)
- # include	<login_cap.h>
--# include	<varargs.h>
-+# include	<stdarg.h>
- # include	<bsd_auth.h>
- #elif defined(USESECUREWARE)
- # include       <sys/types.h>
---
-cgit v0.9.0.2-2-gbebe
-From 78403f6a7420798bf24798811c8c6b936c9ccb34 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 07 Jan 2012 03:34:30 +0000
-Subject: Add some missing malloc failure checks
-
-Flagged by Solaris Studio 12.3 code analyzer
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/xdm/access.c b/xdm/access.c
-index 7035375..b16a066 100644
---- a/xdm/access.c
-+++ b/xdm/access.c
-@@ -304,6 +304,11 @@ tryagain:
-     if (!hostOrAlias)
- 	return NULL;
-     h = malloc (sizeof (DisplayEntry));
-+    if (!h)
-+    {
-+	LogOutOfMem ("ReadHostEntry: DisplayEntry\n");
-+	return NULL;
-+    }
-     h->hopCount = 1;
-     if (*hostOrAlias == ALIAS_CHARACTER)
-     {
-@@ -423,6 +428,11 @@ tryagain:
-     if (!displayOrAlias)
- 	return NULL;
-     d = malloc (sizeof (DisplayEntry));
-+    if (!d)
-+    {
-+	LogOutOfMem ("ReadDisplayEntry: DisplayEntry\n");
-+	return NULL;
-+    }
-     d->notAllowed = 0;
-     d->notBroadcast = 0;
-     d->chooser = 0;
-diff --git a/xdm/choose.c b/xdm/choose.c
-index 6f077eb..e5e003d 100644
---- a/xdm/choose.c
-+++ b/xdm/choose.c
-@@ -128,6 +128,11 @@ RememberIndirectClient (
- 	    connectionType == i->connectionType)
- 	    return 1;
-     i = malloc (sizeof (IndirectUsersRec));
-+    if (!i)
-+    {
-+	LogOutOfMem ("RememberIndirectClient\n");
-+	return 0;
-+    }
-     if (!XdmcpCopyARRAY8 (clientAddress, &i->client))
-     {
- 	free (i);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
deleted file mode 100644
index 195858883..000000000
--- a/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- config/GiveConsole.sessreg-utmp-fix-bug177890	2006-07-24 04:20:10.000000000 -0400
-+++ config/GiveConsole	2006-07-24 04:21:16.000000000 -0400
-@@ -8,3 +8,5 @@
- # causing serious grief.
- #
- chown $USER /dev/console
-+exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
-+        -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/testing/xorg-xdm/xdm-consolekit.patch b/testing/xorg-xdm/xdm-consolekit.patch
deleted file mode 100644
index c52a26138..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 1;
-+    }
-+
-+    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 a0b601db6..000000000
--- a/testing/xorg-xdm/xdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-auth		required	pam_env.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
-session		required	pam_loginuid.so
--session	optional	pam_systemd.so
diff --git a/testing/xournal/PKGBUILD b/testing/xournal/PKGBUILD
deleted file mode 100644
index 4ef0d66a8..000000000
--- a/testing/xournal/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 162297 2012-06-24 19:25:38Z foutrelis $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=xournal
-pkgver=0.4.6
-pkgrel=2
-pkgdesc='Notetaking and sketching application'
-url='http://xournal.sourceforge.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('4ebe79e3df7155d2a09c341537a639ac2332d4c8')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr LIBS='-lm -lz'
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install desktop-install
-}
diff --git a/testing/xournal/install b/testing/xournal/install
deleted file mode 100644
index dfcb68374..000000000
--- a/testing/xournal/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-mime-database usr/share/mime &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/xsp/PKGBUILD b/testing/xsp/PKGBUILD
deleted file mode 100644
index 855cb2480..000000000
--- a/testing/xsp/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 168255 2012-10-06 23:51:34Z tomegun $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=xsp
-pkgver=2.10.2
-pkgrel=4
-pkgdesc="A simple webserver based on mono - provides ASP.NET support"
-arch=(i686 x86_64)
-license=('custom')
-url="http://www.go-mono.com"
-depends=('mono>=2.10.2' 'sqlite')
-options=(!makeflags)
-install=${pkgname}.install
-source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
-        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service)
-
-build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR=${srcdir}/src/weird
-  mkdir -p "${MONO_SHARED_DIR}"
- # import pathes
- # build
-  cd ${srcdir}/${pkgname}-${pkgver}
-  #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
- # tweak the xsp shellscript to grab system dll's
-  for script in scripts/*2; do
-    sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script
-  done
-   #destdir related bugfixes
-  sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
-  sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir}/ install
- # move test files from share to arch' default html home
-  mkdir -p ${pkgdir}/srv/http/html
-  mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp
-  rm -rf ${pkgdir}/usr/share
-  chown -R http:http ${pkgdir}/srv/http/html/${pkgname}
-
- # install a deamon
-  install -D -m755 ${srcdir}/${pkgname}.rc.d \
-    ${pkgdir}/etc/rc.d/${pkgname}
- # install a deamon configurationfile
-  install -D -m644 ${srcdir}/$pkgname.conf.d \
-    ${pkgdir}/etc/conf.d/${pkgname}
- # install a xsp configuration home
-  install -D -m644 ${srcdir}/${pkgname}.webapp \
-    ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
- # install systemd service file
-  install -D -m644 ${srcdir}/${pkgname}.service \
-    ${pkgdir}/usr/lib/systemd/system/xsp.service
-}
-md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
-         '9575bd7d6f64d51ba05bdd6370665858'
-         '35d921df0fefc30f47a438c95d420efc'
-         'c917c07f68b945691506c29750db482f'
-         '9d83bd36d209f8d36a11dfbc4fa50819')
diff --git a/testing/xsp/xsp.conf.d b/testing/xsp/xsp.conf.d
deleted file mode 100644
index 99d634929..000000000
--- a/testing/xsp/xsp.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# xsp options
-
-
-# note that is just the helping app for mod_mono if you like production like
-# quality
-# xsp is for ASP testing mainly  -- read the manpage for xsp to know what
-# options are available. Archlinux will provide xsp configured by a .webapp
-# configuration file which rests in /etc/xsp
-
-XSP_PARAMS="--appconfigdir /etc/xsp"
diff --git a/testing/xsp/xsp.install b/testing/xsp/xsp.install
deleted file mode 100644
index b8a8f3136..000000000
--- a/testing/xsp/xsp.install
+++ /dev/null
@@ -1,37 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
-
--->  xsp is just the helping app for mod_mono if you like a production like
--->  server. xsp itself is for ASP testing mainly  -- read the manpage for xsp
--->  to know which options are available.
--->  Archlinux will provide xsp configured by a .webapp configuration file
--->  which rests in /etc/xsp. Just put your other webapp files there to let
--->  xsp pick them up.
--->  xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all
--->  your arguments there. Don't forget that you can run xsp from the console
--->  as oridinary user, which is safer and for testing absolutely sufficient!!
-
--->  You can run the testpages simply by starting the server and calling 
-                       http://localhost:8080
--->  from your browser's location bar
-
-
-EOM
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
diff --git a/testing/xsp/xsp.rc.d b/testing/xsp/xsp.rc.d
deleted file mode 100644
index b4fcda15c..000000000
--- a/testing/xsp/xsp.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp
-
-PID=`pidof -o %PPID /usr/bin/mono`
-case "$1" in
-  start)
-    stat_busy "Starting Xsp Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xsp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Xsp Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon xsp
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/xsp/xsp.service b/testing/xsp/xsp.service
deleted file mode 100644
index 36b802e21..000000000
--- a/testing/xsp/xsp.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=XSP Web Server
-
-[Service]
-ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/xsp/xsp.webapp b/testing/xsp/xsp.webapp
deleted file mode 100644
index a685dd171..000000000
--- a/testing/xsp/xsp.webapp
+++ /dev/null
@@ -1,8 +0,0 @@
-<apps>
-  <web-application>
-    <name>Root</name>
-      <vpath>/</vpath>
-      <path>/srv/http/html/xsp</path>
-      <vhost>localhost</vhost>
-  </web-application>
-</apps>
diff --git a/testing/xz/PKGBUILD b/testing/xz/PKGBUILD
deleted file mode 100644
index 3d2f9f76f..000000000
--- a/testing/xz/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 162176 2012-06-22 16:39:50Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: François Charette <firmicus@gmx.net>
-
-pkgname=xz
-pkgver=5.0.4
-pkgrel=1
-pkgdesc='Library and command line tools for XZ and LZMA compressed files'
-arch=('i686' 'x86_64')
-url='http://tukaani.org/xz/'
-license=('GPL' 'LGPL' 'custom')
-depends=('sh')
-options=('!libtool')
-source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('df3df690aef18384e1e031be7ec3a964'
-         '6e203465ee9b8f646d85cf84755e2b32')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	./configure --prefix=/usr \
-		--disable-rpath \
-		--enable-werror
-	make
-}
-
-check() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make check
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install
-	install -d -m755 ${pkgdir}/usr/share/licenses/xz/
-	ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/
-	ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2
-}
diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD
deleted file mode 100644
index 5beeefb34..000000000
--- a/testing/yelp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169534 2012-10-23 10:29:09Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=yelp
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64')
-depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
-         'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gtk-doc' 'itstool')
-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=('55a0bd94405c2d2b6230d1be9f88fe978930f6228e4f1cc2f58f923421243404')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/yelp/yelp.install b/testing/yelp/yelp.install
deleted file mode 100644
index 2a1cb91e9..000000000
--- a/testing/yelp/yelp.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/yp-tools/PKGBUILD b/testing/yp-tools/PKGBUILD
deleted file mode 100644
index 0e9a14891..000000000
--- a/testing/yp-tools/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 165811 2012-08-30 19:22:40Z tomegun $
-# Mantainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=yp-tools
-pkgver=2.12
-pkgrel=4
-pkgdesc='Linux NIS Tools'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/yp-tools/'
-license=('GPL2')
-depends=('ypbind-mt')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'domainname.service')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service"
-}
-md5sums=('ce1e06d86caa285fa8cd76fdf103f51e'
-         '8d354b76eb0df9a3b06637bfff87453b')
diff --git a/testing/yp-tools/domainname.service b/testing/yp-tools/domainname.service
deleted file mode 100644
index 035f767c8..000000000
--- a/testing/yp-tools/domainname.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=NIS Domainname
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nisdomainname
-ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME
-RemainAfterExit=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD
deleted file mode 100644
index 99213a1d9..000000000
--- a/testing/ypbind-mt/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 161942 2012-06-16 17:17:28Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=5
-pkgdesc='Linux NIS daemon'
-url='http://www.linux-nis.org/nis/ypbind-mt/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'nisdomainname.conf'
-        'ypbind.conf'
-        'ypbind'
-	'ypbind.service')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--enable-dbus-nm \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
-	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
-	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
-	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
-	install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service
-	install -d -m755 "${pkgdir}"/var/yp/binding
-}
-md5sums=('692f68ed0476762be4228ce543a5b791'
-         'e83a85291ea2ee152a78f2c16b0b1185'
-         '229309a989abad27703ac2e6d07dc7ae'
-         '1f7a4c80414d580c9afb3a08267beed0'
-         '88a721095e334cd442f4649a151ba9be')
diff --git a/testing/ypbind-mt/nisdomainname.conf b/testing/ypbind-mt/nisdomainname.conf
deleted file mode 100644
index bbbbf8fc7..000000000
--- a/testing/ypbind-mt/nisdomainname.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# NIS domain to be set in /etc/rc.d/ypbind
-#
-NISDOMAINNAME=""
diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/testing/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
-	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac
diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/testing/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""
diff --git a/testing/ypbind-mt/ypbind.service b/testing/ypbind-mt/ypbind.service
deleted file mode 100644
index c59231000..000000000
--- a/testing/ypbind-mt/ypbind.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=YP Bind
-Requires=rpcbind.service domainname.service
-After=rpcbind.service domainname.service network.target
-Before=systemd-user-sessions.service
-
-[Service]
-Type=forking
-PIDFile=/run/ypbind.pid
-ExecStart=/usr/sbin/ypbind
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD
deleted file mode 100644
index 25fc92df0..000000000
--- a/testing/ypserv/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 167986 2012-10-04 17:42:55Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypserv
-pkgver=2.28
-pkgrel=2
-pkgdesc='Linux NIS Server'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/ypserv/'
-license=('GPL2')
-depends=('gdbm' 'openslp' 'inetutils' 'yp-tools')
-optdepends=('gawk: for printcap support')
-backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'confpost.patch'
-        'ypxfrd.service'
-        'yppasswdd.service'
-	'ypserv.service'
-        'yppasswd'
-        'ypserv')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../confpost.patch
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
-	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
-	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
-	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
-	install -D -m644 ../ypxfrd.service "${pkgdir}"/usr/lib/systemd/system/ypxfrd.service
-	install -D -m644 ../ypserv.service "${pkgdir}"/usr/lib/systemd/system/ypserv.service
-	install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service
-
-	# Provide native service for arch-daemons generator
-	ln -s yppasswdd.service "$pkgdir/usr/lib/systemd/system/yppasswd.service"
-}
-md5sums=('ed64f489bab494218fc5c5942b95d5b6'
-         '8acb314f30d6e531ac9efa8655f68ccb'
-         'c80e253756446d59a90c4c21b1cb8740'
-         '7cba3dd3544436c3c1f05e36c0018e92'
-         '3398271c3e0a054e64b06b99aa2dc63d'
-         '4bc84c48ed1bb9659698853acb5cfd76'
-         'c40befe5932f1b42efaced6b46809303')
diff --git a/testing/ypserv/confpost.patch b/testing/ypserv/confpost.patch
deleted file mode 100644
index 489e4368a..000000000
--- a/testing/ypserv/confpost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
---- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
-+++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
-@@ -0,0 +1,10 @@
-+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
-+ * libraries gdbm and qdbm have same symbol names. */
-+#undef HAVE_COMPAT_LIBGDBM
-+#ifdef HAVE_LIBGDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+#ifdef HAVE_LIBQDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+
diff --git a/testing/ypserv/yppasswd b/testing/ypserv/yppasswd
deleted file mode 100755
index c2b00b2ca..000000000
--- a/testing/ypserv/yppasswd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Password Daemon"
-    /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Password Daemon"
-    killall -q /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/ypserv/yppasswdd.service b/testing/ypserv/yppasswdd.service
deleted file mode 100644
index 9a7068b6c..000000000
--- a/testing/ypserv/yppasswdd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NIS/YP (Network Information Service) Users Passwords Change Server
-Requires=rpcbind.service
-After=network.target rpcbind.service
-
-[Service]
-Type=forking
-PIDFile=/run/yppasswdd.pid
-ExecStart=/usr/sbin/rpc.yppasswdd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ypserv/ypserv b/testing/ypserv/ypserv
deleted file mode 100755
index c36e6901b..000000000
--- a/testing/ypserv/ypserv
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Server"
-    /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ypserv
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Server"
-    killall -q /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ypserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/ypserv/ypserv.service b/testing/ypserv/ypserv.service
deleted file mode 100644
index 024a92e5a..000000000
--- a/testing/ypserv/ypserv.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NIS/YP (Network Information Service) Server
-Requires=rpcbind.service
-After=network.target rpcbind.service 
-
-[Service]
-Type=forking
-PIDFile=/run/ypserv.pid
-ExecStart=/usr/sbin/ypserv
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ypserv/ypxfrd.service b/testing/ypserv/ypxfrd.service
deleted file mode 100644
index 322ef559f..000000000
--- a/testing/ypserv/ypxfrd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NIS/YP (Network Information Service) Maps Transferring Accelerator
-Requires=rpcbind.service
-After=network.target rpcbind.service
-
-[Service]
-Type=forking
-PIDFile=/run/ypxfrd.pid
-ExecStart=/usr/sbin/rpc.ypxfrd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/zenity/PKGBUILD b/testing/zenity/PKGBUILD
deleted file mode 100644
index d5dd093fe..000000000
--- a/testing/zenity/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169139 2012-10-18 19:22:03Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=zenity
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk3' 'libnotify')
-makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/zsh/PKGBUILD b/testing/zsh/PKGBUILD
deleted file mode 100644
index ae4a6f30d..000000000
--- a/testing/zsh/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 163903 2012-07-21 22:24:24Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=zsh
-pkgver=5.0.0
-pkgrel=1
-pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
-arch=('i686' 'x86_64')
-url='http://www.zsh.org/'
-license=('custom')
-depends=('pcre' 'libcap' 'gdbm')
-install=zsh.install
-source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
-        'zprofile')
-backup=('etc/zsh/zprofile')
-md5sums=('e8484468925cec8d9a84b8b04797e764'
-         '24a9335edf77252a7b5f52e079f7aef7')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	# FS#16360
-	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
-				 Doc/zsh.texi \
-				 Completion/Unix/Type/_services \
-				 Completion/Unix/Command/_init_d
-
-	# Remove unneeded and conflicting completion scripts
-	rm -rf Completion/{AIX,BSD,Cygwin,Darwin,Debian,Mandriva,openSUSE,Redhat,Solaris}
-	rm -f  Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
-	rm -f  Completion/Unix/Command/_osc
-
-	./configure --prefix=/usr \
-		--bindir=/bin \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-maildir-support \
-		--with-term-lib='ncursesw' \
-		--enable-multibyte \
-		--enable-function-subdirs \
-		--enable-fndir=/usr/share/zsh/functions \
-		--enable-scriptdir=/usr/share/zsh/scripts \
-		--with-tcsetpgrp \
-		--enable-pcre \
-		--enable-cap \
-		--enable-zsh-secure-free
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	HOME="${srcdir}" make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
-	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
-	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/zsh/zprofile b/testing/zsh/zprofile
deleted file mode 100644
index 6bfcdf7cb..000000000
--- a/testing/zsh/zprofile
+++ /dev/null
@@ -1 +0,0 @@
-emulate sh -c 'source /etc/profile'
diff --git a/testing/zsh/zsh.install b/testing/zsh/zsh.install
deleted file mode 100644
index e2a53bea8..000000000
--- a/testing/zsh/zsh.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	sed -i '/^\/bin\/zsh/d' etc/shells
-}