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

Conflicts: community/asunder/PKGBUILD community/gshare/PKGBUILD community/kim4/PKGBUILD community/listen/PKGBUILD community/mercury/PKGBUILD core/eglibc/nscd
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-11-15 11:37:21 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-11-15 11:37:21 -0300
commit: a1ae9076f18ec51553e17dfe867f95b6b4931362 (patch)
tree: c0ca52078abd65c9f3d4c40cf871bbae7d17d5c2
parent: 7caeeae33fd491dbea5044168bbc50197963118c (diff)
parent: 28b13b7e8e6e1e4fa1593f0dfb1c37569f2f90a8 (diff)
651 files changed, 0 insertions, 33214 deletions
diff --git a/community-staging/calibre/PKGBUILD b/community-staging/calibre/PKGBUILD
deleted file mode 100644
index 1bfbe0b63..000000000
--- a/community-staging/calibre/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 58167 2011-11-07 16:05:15Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Petrov Roman <nwhisper@gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-
-pkgname=calibre
-pkgver=0.8.25
-pkgrel=2
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64') 
-url="http://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
-         'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 
-         'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 
-         'python-imaging' 'desktop-file-utils' 'shared-mime-info' 
-         'python-dnspython' 'unrar' 'python2-pyqt' 'icu')
-makedepends=('python2-pycountry')
-optdepends=('ipython: to use calibre-debug')
-install=calibre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'desktop_integration.patch'
-        'calibre-mount-helper')
-md5sums=('b7b141db18912925be08ff79fd2ead3f'
-         '253ce4fe5d01f8ff76b63cd3825755ea'
-         '675cd87d41342119827ef706055491e7')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  #rm -rf src/{cherrypy,pyPdf}
-  rm -rf src/cherrypy
-  sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
-  sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
-    $(find . -regex ".*.py\|.*.recipe")
-
-  python2 setup.py build
-  python2 setup.py resources
-  python2 setup.py translations
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  
-  patch -Np1 -i "${srcdir}/desktop_integration.patch"
-
-  # More on desktop integration (e.g. enforce arch defaults)
-  sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
-      -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
-      -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
-      -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
-      -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
-
-  # Fix the environment module location
-  sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
-
-  install -d "${pkgdir}/usr/lib/python2.7/site-packages"
-  python2 setup.py install --root="${pkgdir}" --prefix=/usr \
-    --staging-bindir="${pkgdir}/usr/bin" \
-    --staging-libdir="${pkgdir}/usr/lib" \
-    --staging-sharedir="${pkgdir}/usr/share"
-
-  find "${pkgdir}" -type d -empty -delete
-
-  # Decompress the man pages so makepkg will do it for us.
-  for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do
-    bzip2 -d "${decom}"
-  done
-
-  # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
-  rm -rf ${pkgdir}/usr/bin/calibre-mount-helper
-  install -m 755 ${srcdir}/calibre-mount-helper "${pkgdir}/usr/bin"
-}
diff --git a/community-staging/calibre/calibre-mount-helper b/community-staging/calibre/calibre-mount-helper
deleted file mode 100755
index 00cac4270..000000000
--- a/community-staging/calibre/calibre-mount-helper
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-# Replacement for upstream mount helper using udisks/eject
-# (C) 2010 Martin Pitt <mpitt@debian.org>
-
-ACTION="$1"
-DEV="$2"
-
-case "$ACTION" in
-    mount)
-	udisks --mount "$DEV"
-    
-	# check if mount worked. If not, fail
-	# udisks does return 0 even if mount failed
-	mount | grep -q "$DEV" || exit 0
-	;;
-
-    eject)
-	eject "$DEV"
-	;;
-
-    cleanup)
-	;;
-
-    *)
-	echo "unknown action" >&2
-	exit 1
-esac
-
diff --git a/community-staging/calibre/calibre.install b/community-staging/calibre/calibre.install
deleted file mode 100644
index 6210bd0ab..000000000
--- a/community-staging/calibre/calibre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/calibre/desktop_integration.patch b/community-staging/calibre/desktop_integration.patch
deleted file mode 100644
index 4dbf53757..000000000
--- a/community-staging/calibre/desktop_integration.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/src/calibre/linux.py	2011-06-17 19:56:05.000000000 +0200
-+++ b/src/calibre/linux.py	2011-06-18 00:07:46.000000000 +0200
-@@ -339,51 +339,39 @@
- 
-             with TemporaryDirectory() as tdir:
-                 with CurrentDir(tdir):
--                    render_img('mimetypes/lrf.png', 'calibre-lrf.png')
--                    check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
--                    self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
--                    check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
--                    self.icon_resources.append(('mimetypes', 'application-lrs',
--                    '128'))
--                    render_img('lt.png', 'calibre-gui.png')
--                    check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True)
--                    self.icon_resources.append(('apps', 'calibre-gui', '128'))
--                    render_img('viewer.png', 'calibre-viewer.png')
--                    check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
--                    self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-+                    dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+                    os.mkdir(dir)
-+                    render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+                    render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+                    render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
- 
-                     mimetypes = set([])
-                     for x in all_input_formats():
-                         mt = guess_type('dummy.'+x)[0]
--                        if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
-+                        if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
-                             mimetypes.add(mt)
- 
-                     def write_mimetypes(f):
-                         f.write('MimeType=%s;\n'%';'.join(mimetypes))
- 
--                    f = open('calibre-lrfviewer.desktop', 'wb')
-+                    dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+                    os.mkdir(dir)
-+                    f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
-                     f.write(VIEWER)
-                     f.close()
--                    f = open('calibre-ebook-viewer.desktop', 'wb')
-+                    f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
-                     f.write(EVIEWER)
-                     write_mimetypes(f)
-                     f.close()
--                    f = open('calibre-gui.desktop', 'wb')
-+                    f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
-                     f.write(GUI)
-                     write_mimetypes(f)
-                     f.close()
--                    des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
--                            'calibre-ebook-viewer.desktop')
--                    for x in des:
--                        cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
--                        check_call(' '.join(cmd), shell=True)
--                        self.menu_resources.append(x)
--                    check_call(['xdg-desktop-menu', 'forceupdate'])
--                    f = open('calibre-mimetypes', 'wb')
-+                    dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+                    os.makedirs(dir)
-+                    f = open(os.path.join(dir, 'calibre.xml'), 'wb')
-                     f.write(MIME)
-                     f.close()
--                    self.mime_resources.append('calibre-mimetypes')
--                    check_call('xdg-mime install ./calibre-mimetypes', shell=True)
-         except Exception:
-             if self.opts.fatal_errors:
-                 raise
diff --git a/community-staging/deadbeef/PKGBUILD b/community-staging/deadbeef/PKGBUILD
deleted file mode 100644
index 4b49c0602..000000000
--- a/community-staging/deadbeef/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 57696 2011-11-01 10:47:22Z jelle $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.5.1
-pkgrel=3
-pkgdesc='An audio player for GNU/Linux based on GTK2.'
-arch=('i686' 'x86_64')
-url='http://deadbeef.sourceforge.net'
-license=('GPL2')
-depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
-             'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
-             'libsamplerate')
-optdepends=('libsamplerate: for Resampler plugin'
-            'libvorbis: for Ogg Vorbis playback'
-            'libmad: for MP1/MP2/MP3 playback'
-            'flac: for FLAC playback'
-            'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
-            'imlib2: for artwork plugin'
-            'wavpack: for WavPack playback'
-            'libsndfile: for Wave playback'
-            'libcdio: audio cd plugin'
-            'libcddb: audio cd plugin'
-            'ffmpeg: for WMA, AA, OMA, AC, etc.'
-            'faad2: for AAC/MP4 support'
-            'dbus: for OSD notifications support'
-            'pulseaudio: for PulseAudio output plugin'
-            'libx11: for global hotkeys plugin'
-            'zlib: for Audio Overload plugin'
-            'libzip: for vfs_zip plugin')
-options=('!libtool')
-install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/ffmpeg.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
-md5sums=('be8359d1bd9cf7679cf2ca748996e726'
-         '6cc7623734af310095534c361c9f64e8')
diff --git a/community-staging/deadbeef/deadbeef.install b/community-staging/deadbeef/deadbeef.install
deleted file mode 100644
index eaf1b9a69..000000000
--- a/community-staging/deadbeef/deadbeef.install
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgname=deadbeef
-
-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/community-staging/deadbeef/ffmpeg.patch b/community-staging/deadbeef/ffmpeg.patch
deleted file mode 100644
index 925b84408..000000000
--- a/community-staging/deadbeef/ffmpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c
---- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c	2011-05-22 13:58:53.000000000 +0000
-+++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c	2011-11-01 10:38:11.447669741 +0000
-@@ -140,7 +140,12 @@
-     for (i = 0; i < info->fctx->nb_streams; i++)
-     {
-         info->ctx = info->fctx->streams[i]->codec;
--        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (info->ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+		            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             info->codec = avcodec_find_decoder (info->ctx->codec_id);
-             if (info->codec != NULL) {
-@@ -490,7 +495,12 @@
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+		            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
-@@ -745,7 +755,12 @@
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+			            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL)
diff --git a/community-staging/dvdstyler/PKGBUILD b/community-staging/dvdstyler/PKGBUILD
deleted file mode 100644
index f0d8ccc70..000000000
--- a/community-staging/dvdstyler/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 57687 2011-11-01 09:55:55Z ebelanger $
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=dvdstyler
-pkgver=2.0
-pkgrel=2
-pkgdesc="Cross-platform DVD authoring application"
-arch=('i686' 'x86_64')
-url="http://www.dvdstyler.de/"
-license=('GPL')
-depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui')
-makedepends=('zip' 'xmlto' 'docbook-xsl')
-optdepends=('dvdisaster: ECC support')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2)
-sha1sums=('21bb4e25c851e70cdd3ce37f3e319c71e78f74a6')
-
-build() {
-  cd "${srcdir}/DVDStyler-${pkgver}"
-  sed -i 's/rmdir "$$t"//' docs/Makefile.in
-  sed -i 's/vsink_buffer.h/buffersink.h/' src/mediatrc_ffmpeg.cpp
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/DVDStyler-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/electricsheep/PKGBUILD b/community-staging/electricsheep/PKGBUILD
deleted file mode 100644
index 7becdf2ba..000000000
--- a/community-staging/electricsheep/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 57681 2011-11-01 05:04:13Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=electricsheep
-pkgver=2.7b12
-pkgrel=4
-pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
-arch=('i686' 'x86_64')
-url="http://community.electricsheep.org/"
-license=('GPL')
-depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
-makedepends=('xscreensaver')
-optdepends=('xscreensaver: to use electricsheep with xscreensaver')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        electricsheep-ffmpeg.patch)
-sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32'
-          'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/share/applications/screensavers"
-  install -d "${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver"
-  make DESTDIR="${pkgdir}" GNOME_SCREENSAVER_DATADIR="${pkgdir}/usr/share/applications/screensavers" \
-    GNOME_SCREENSAVER_PRIVEXEDIR="${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" install
-  install -D -m644 electricsheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
-  install -D -m644 electricsheep.xml "${pkgdir}/usr/share/xscreensaver/config/electricsheep.xml"
-  install -D -m755 electricsheep-saver "${pkgdir}/usr/bin/electricsheep-saver"
-}
diff --git a/community-staging/electricsheep/electricsheep-ffmpeg.patch b/community-staging/electricsheep/electricsheep-ffmpeg.patch
deleted file mode 100644
index b04cf41b0..000000000
--- a/community-staging/electricsheep/electricsheep-ffmpeg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
---- electricsheep-2.7b12.orig/electricsheep.c	2011-10-31 22:36:30.000000000 -0400
-+++ electricsheep-2.7b12/electricsheep.c	2011-10-31 22:40:04.000000000 -0400
-@@ -662,7 +662,7 @@
-     input_stream_index = -1;
-     for (j = 0; j < ictx->nb_streams; j++) {
- 	AVCodecContext *enc = ictx->streams[j]->codec;
--	if (CODEC_TYPE_VIDEO == enc->codec_type) {
-+	if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
- 	    input_stream_index = j;
- 	    break;
- 	}
-@@ -730,7 +730,7 @@
- 	av_init_packet(&opkt);
- 	if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
- 			     &opkt.data, &opkt.size, ipkt.data, ipkt.size,
--			     ipkt.flags & PKT_FLAG_KEY))
-+			     ipkt.flags & AV_PKT_FLAG_KEY))
- 	    opkt.destruct= av_destruct_packet;
- 		
- 	if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
-diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
---- electricsheep-2.7b12.orig/electricsheep.c	2011-11-01 00:21:51.000000000 -0400
-+++ electricsheep-2.7b12/electricsheep.c	2011-11-01 00:25:10.000000000 -0400
-@@ -686,9 +686,9 @@
- 	    }
- 	}
- 
--	output_ctx = av_alloc_format_context();
-+	output_ctx = avformat_alloc_context();
- 
--	ofmt = guess_format(NULL, fname, NULL);
-+	ofmt = av_guess_format(NULL, fname, NULL);
- 	if (!ofmt) {
- 	    fprintf(logout, "could not determine format from %s.\n", fname);
- 	    exit(1);
diff --git a/community-staging/ffmpeg2theora/PKGBUILD b/community-staging/ffmpeg2theora/PKGBUILD
deleted file mode 100644
index 6cc8cf6fa..000000000
--- a/community-staging/ffmpeg2theora/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 57906 2011-11-04 10:37:07Z jelle $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
-
-pkgname=ffmpeg2theora
-pkgver=0.28
-pkgrel=2
-pkgdesc="A simple converter to create Ogg Theora files"
-arch=('i686' 'x86_64')
-url="http://www.v2v.cc/~j/ffmpeg2theora/"
-license=('GPL3')
-depends=('ffmpeg')
-makedepends=('pkgconfig' 'scons')
-changelog=$pkgname.changelog
-source=(http://www.v2v.cc/~j/${pkgname}/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  scons
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man"
-}
diff --git a/community-staging/ffmpeg2theora/ffmpeg2theora.changelog b/community-staging/ffmpeg2theora/ffmpeg2theora.changelog
deleted file mode 100644
index adbe34807..000000000
--- a/community-staging/ffmpeg2theora/ffmpeg2theora.changelog
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-10-09  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
-
-	* ffmpeg2theora 0.28-1
-	* Upstream update
-
-2010-06-25  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.27-1
-	* Upstream update
-
-2010-02-05  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.26-1
-	* Upstream update
-	* Updated license
-	* Updated source url
-
-2010-01-10  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.25-1
-	* Upstream update
-	* Built against ffmpeg 20100108
-
-2009-06-06  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.24-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/community-staging/gambas2/PKGBUILD b/community-staging/gambas2/PKGBUILD
deleted file mode 100644
index 320b2097e..000000000
--- a/community-staging/gambas2/PKGBUILD
+++ /dev/null
@@ -1,950 +0,0 @@
-# $Id: PKGBUILD 58161 2011-11-07 13:18:23Z lcarlier $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Toni Foerster <stonerl@skeps.de>
-
-pkgbase="gambas2"
-pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
-         'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-         'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-         'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-         'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-         'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
-         'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-         'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-         'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-         'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-         'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
-         'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-pkgver=2.23.1
-pkgrel=5
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net"
-depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils'
-         'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
-         'libxcursor' 'libsm')
-makedepends=('intltool' 'mysql' 'postgresql')
-license=('GPL2')
-options=('!emptydirs' '!makeflags')
-groups=('gambas2')
-replaces=('gambas2')
-conflicts=('gambas2')
-source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
-        'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
-	'poppler-0.18.patch'
-	'gambas2-script.install' 'gambas2-runtime.install')
-md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
-         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
-         'ac9703b390502ed3242c8d34485c9236'
-         'a551b4b216bbdb3489f3c264bf73ee66'
-         '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b')
-_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
-
-_buildgbcomp() {
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  install $1.gambas ${pkgdir}/usr/lib/gambas2/
-  install .component ${pkgdir}/usr/lib/gambas2/$1.component
-  chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component
-  install .info ${pkgdir}/usr/share/gambas2/info/$1.info
-  chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info
-  install .list ${pkgdir}/usr/share/gambas2/info/$1.list
-  chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list
-  if test -d control; then
-    install -d ${pkgdir}/usr/share/gambas2/control/$1
-    install control/*.png ${pkgdir}/usr/share/gambas2/control/$1
-    chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png
-  fi
-}
-
-build() {
-  cd "${srcdir}/$pkgbase-$pkgver"
-
-  ## workaround to allow package splitting
-  msg "Applying patches ..."
-  patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
-  # merged upstream
-  patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
-  patch -Np2 -i "${srcdir}/poppler-0.18.patch"
-  ./reconf-all
-  ##
-  
-  . /etc/profile.d/kde3.sh
-  . /etc/profile.d/qt3.sh
-
-  ./configure -C --disable-qte --prefix=/usr
-  make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas2-meta() {
-  depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
-           'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-           'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-           'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-           'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
-           'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-           'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-           'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-           'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-           'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
-           'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-  pkgdesc="Gambas2 meta package"
-}
-
-package_gambas2-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Gambas2 runtime environment"
-  install=gambas2-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \
-    ${pkgdir}/usr/lib/gambas2
-  ln -s gbx2 ${pkgdir}/usr/bin/gbr2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-
-  ## needed for postinst with xdg-utils
-  install -d -m755 ${pkgdir}/usr/share/gambas2/mime
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \
-    ${pkgdir}/usr/share/gambas2/mime/
-  install -d -m755 ${pkgdir}/usr/share/gambas2/icons
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \
-    ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png
-}
-
-package_gambas2-devel() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-ide() {
-  depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings'
-           'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel')
-  pkgdesc="Gambas2 Integrated Development Environment"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.dialog
-  _buildgbcomp gb.form.mdi
-  _buildgbcomp gb.settings
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
-  rm ${pkgdir}/usr/bin/gbx2
-  ##
-
-  install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin
-  install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin
-  ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \
-    ${pkgdir}/usr/share/applications/gambas2.desktop
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \
-    ${pkgdir}/usr/share/pixmaps/gambas2.png
-}
-
-package_gambas2-examples() {
-  depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-           'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-           'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-           'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
-           'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-           'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-           'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-           'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-           'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
-           'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-  pkgdesc="Gambas2 examples"
-#  arch=('any')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas2/{help,info}
-}
-
-package_gambas2-help() {
-  depends=()
-  pkgdesc="Gambas2 help files"
-#  arch=('any')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/help
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  #fix help
-  chown root:root -R ${pkgdir}/usr/share/gambas2/help/help
-}
-
-package_gambas2-script() {
-  depends=('gambas2-devel')
-  pkgdesc="Gambas2 scripter and server programs support"
-  install=gambas2-script.install
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  install -m755 gbs2.gambas ${pkgdir}/usr/bin
-
-  ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2
-  ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2  
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
-  rm ${pkgdir}/usr/bin/gbx2
-  ##
-
-  ## needed for postinst with xdg-utils
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
-  install -d -m755 ${pkgdir}/usr/share/gambas2/mime
-  install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/
-  install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/
-  ##
-}
-
-package_gambas2-gb-chart() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 chart component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.chart
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-compress() {
-  depends=('gambas2-runtime' 'bzip2' 'zlib')
-  pkgdesc="Gambas2 compression support component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-corba() {
-  depends=('gambas2-runtime' 'omniorb')
-  pkgdesc="Gambas2 corba component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-crypt() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 MD5/DES crypting component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-firebird() {
-  depends=('gambas2-gb-db' 'libfbclient')
-  pkgdesc="Gambas2 Firebird database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-form() {
-  depends=('gambas2-gb-db' 'gambas2-gb-form')
-  pkgdesc="Gambas2 database form component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.db.form
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-db-mysql() {
-  depends=('gambas2-gb-db' 'libmysqlclient')
-  pkgdesc="Gambas2 MySQL database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-odbc() {
-  depends=('gambas2-gb-db' 'unixodbc')
-  pkgdesc="Gambas2 ODBC database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-postgresql() {
-  depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1')
-  pkgdesc="Gambas2 PostgreSQL database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite2() {
-  depends=('gambas2-gb-db' 'sqlite2')
-  pkgdesc="Gambas2 Sqlite2 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite3() {
-  depends=('gambas2-gb-db' 'sqlite3')
-  pkgdesc="Gambas2 Sqlite3 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-desktop() {
-  depends=('gambas2-runtime' 'libsm' 'libxtst')
-  pkgdesc="Gambas2 desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form() {
-  depends=('gambas2-gb-gui')
-  pkgdesc="Gambas2 form component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form-dialog() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 form dialog component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.dialog
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form-mdi() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 form MDI component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.mdi
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk() {
-  depends=('gambas2-runtime' 'gtk2')
-  pkgdesc="Gambas2 graphical GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk-ext() {
-  depends=('gambas2-gb-gtk')
-  pkgdesc="Gambas2 graphical GTK+ toolkit extension component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk-svg() {
-  depends=('gambas2-gb-gtk' 'librsvg')
-  pkgdesc="Gambas2 graphical GTK+ toolkit svg component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gui() {
-  depends=('gambas2-gb-qt' 'gambas2-gb-gtk')
-  pkgdesc="Gambas2 automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-image() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 image processing component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-info() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 info component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.info
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-net() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 networking component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-curl() {
-  depends=('gambas2-runtime' 'curl')
-  pkgdesc="Gambas2 advanced networking component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-smtp() {
-  depends=('gambas2-runtime' 'glib2')
-  pkgdesc="Gambas2 SMTP component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-opengl() {
-  depends=('gambas2-runtime' 'libgl' 'mesa')
-  pkgdesc="Gambas2 OpenGL component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-option() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 command-line options component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pcre() {
-  depends=('gambas2-runtime' 'pcre')
-  pkgdesc="Gambas2 PCRE component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pdf() {
-  depends=('gambas2-runtime' 'poppler-glib')
-  pkgdesc="Gambas2 PDF component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-qt() {
-  depends=('gambas2-runtime' 'qt3')
-  pkgdesc="Gambas2 graphical QT toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-ext() {
-  depends=('gambas2-gb-qt')
-  pkgdesc="Gambas2 graphical QT toolkit extension component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-opengl() {
-  depends=('gambas2-gb-qt' 'libgl')
-  pkgdesc="Gambas2 graphical QT toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-kde() {
-  depends=('gambas2-gb-qt' 'kdelibs3')
-  pkgdesc="Gambas2 KDE component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html*
-  rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html*
-}
-
-package_gambas2-gb-qt-kde-html() {
-  depends=('gambas2-gb-qt-kde')
-  pkgdesc="Gambas2 KHTML component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-report() {
-  depends=('gambas2-runtime' 'gambas2-gb-form')
-  pkgdesc="Gambas2 report component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.report
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-sdl() {
-  depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl')
-  pkgdesc="Gambas2 SDL component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-sdl-sound() {
-  depends=('gambas2-runtime' 'sdl_mixer')
-  pkgdesc="Gambas2 SDL sound component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-settings() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 settings management component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.settings
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-v4l() {
-  depends=('gambas2-runtime' 'libjpeg' 'libpng')
-  pkgdesc="Gambas2 V4L component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-vb() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 VB transitional component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-web() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 CGI component"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.web
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml() {
-  depends=('gambas2-runtime' 'libxml2')
-  pkgdesc="Gambas2 xml component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml-rpc() {
-  depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl')
-  pkgdesc="Gambas2 xml-rpc component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml-xslt() {
-  depends=('gambas2-gb-xml' 'libxslt')
-  pkgdesc="Gambas2 xml-xslt component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
diff --git a/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch
deleted file mode 100644
index 0b6e68df3..000000000
--- a/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gambas/branches/2.0/gb.db.firebird/src/main.cpp	2011/05/27 15:01:54	3864
-+++ gambas/branches/2.0/gb.db.firebird/src/main.cpp	2011/05/27 15:26:41	3865
-@@ -1216,7 +1216,8 @@
-         GB.StoreVariant(&fantom, &buffer[i]);
-       }
-       else{
--        GB.StoreVariant(&res->GetData(pos,i), &buffer[i]);
-+	GB_VARIANT val = res->GetData(pos,i);
-+        GB.StoreVariant(&val , &buffer[i]);
-       }
-     }
-   }
-@@ -1874,6 +1875,8 @@
-   static char query[SQLMAXLEN];
-   int type;
-   std::string str1,str2;
-+  GB_VARIANT varval;
-+  char* charval;
-   snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field);
-   if (do_query(db, query, &res, "Unable to get the field from the table")){
-     delete res;
-@@ -1900,9 +1903,11 @@
-     str1=res->GetData(0,3).value.value._string;
-   if(str1!="")
-     str2=str1.assign(str1,8,str1.length()-8);
--  GB.FreeString(&res->GetData(0,3).value.value._string);
-+  charval = res->GetData(0,3).value.value._string;
-+  GB.FreeString(&charval);
-   res->SetData(0,3,str2);
--  GB.StoreVariant(&res->GetData(0,3), &info->def);
-+  varval = res->GetData(0,3);
-+  GB.StoreVariant(&varval, &info->def);
-   }
-   delete res;
-   return FALSE;
diff --git a/community-staging/gambas2/fix-gbi-gba-path.patch b/community-staging/gambas2/fix-gbi-gba-path.patch
deleted file mode 100644
index 9be8e921e..000000000
--- a/community-staging/gambas2/fix-gbi-gba-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- component.am	2010-03-15 20:54:43.000000000 +0100
-+++ ../component.am	2010-04-30 15:00:47.218700833 +0200
-@@ -6,17 +6,17 @@
- 	@if test -d $(COMPONENT); then \
- 		echo "Compiling the $(COMPONENT) project..."; \
- 		( \
--			$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
-+			$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
- 			cd $(COMPONENT); \
--			$(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
--			$(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
-+			$(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-+			$(GBFILES)/gba$(GAMBAS_VERSION); \
- 			rm -rf .gambas; \
- 			$(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \
- 		) \
- 	fi
- 	@echo
- 	@echo "Creating the information files for $(COMPONENT) component..."
--	@$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
-+	@$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
- 	@echo
- 
- uninstall-hook:
diff --git a/community-staging/gambas2/gambas2-runtime.install b/community-staging/gambas2/gambas2-runtime.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-staging/gambas2/gambas2-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas2/gambas2-script.install b/community-staging/gambas2/gambas2-script.install
deleted file mode 100644
index 86558e434..000000000
--- a/community-staging/gambas2/gambas2-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-staging/gambas2/gambas2.install b/community-staging/gambas2/gambas2.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-staging/gambas2/gambas2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas2/poppler-0.18.patch b/community-staging/gambas2/poppler-0.18.patch
deleted file mode 100644
index fbcc430bf..000000000
--- a/community-staging/gambas2/poppler-0.18.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- gambas/trunk/gb.pdf/configure.ac	2010/07/14 01:50:18	3038
-+++ gambas/trunk/gb.pdf/configure.ac	2011/08/09 10:43:30	3997
-@@ -22,6 +22,8 @@
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8)
-   pkg-config --atleast-version=0.11.3 poppler
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
-+  pkg-config --atleast-version=0.17.0 poppler
-+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
- fi
- 
- AC_OUTPUT( \
-
---- gambas/trunk/gb.pdf/src/CPdfDocument.cpp	2011/06/03 00:51:09	3870
-+++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp	2011/08/09 10:43:30	3997
-@@ -44,6 +44,7 @@
- #include <Outline.h>
- #include <Link.h>
- #include <Gfx.h>
-+#include <glib/poppler-features.h>
- 
- /*****************************************************************************
- 
-@@ -956,12 +957,17 @@
-  Bookmarks of a PDF page
- 
- ******************************************************************************/
-+
- void aux_fill_links(void *_object)
- {
-+	#if POPPLER_VERSION_0_17
-+	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
-+	#else
- 	Object obj;
- 	
- 	THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ());
- 	obj.free();
-+	#endif
- }
- 
- BEGIN_PROPERTY (PDFPAGELINKS_count)
diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD
deleted file mode 100644
index 73117ea48..000000000
--- a/community-staging/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1097 +0,0 @@
-# $Id: PKGBUILD 58254 2011-11-09 13:25:44Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
-         'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
-         'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
-         'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
-         'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
-         'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
-         'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
-         'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-         'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.6
-pkgrel=3
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL')
-groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
-         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'qtwebkit'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
-         'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
-options=('!emptydirs' '!makeflags')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('746aaae5494c4b267bdae802c5c006d5'
-         'b284be39d147ec799f1116a6abc068b4'
-         'b5cc403990f31b8ea1c5cf37366d3d29')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  ./reconf-all
-  ./configure --prefix=/usr -C
-
-  make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Runtime environment"
-  install=gambas3-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" install
-
-  cd ../gbx
-  make DESTDIR="${pkgdir}" install
-  cd ../lib/debug
-  make DESTDIR="${pkgdir}" install
-  cd ../eval
-  make DESTDIR="${pkgdir}" install
-  cd ../draw
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../gb.component \
-    ${pkgdir}/usr/lib/gambas3
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  ln -s gbx3 ${pkgdir}/usr/bin/gbr3
-  gbc/gbi3 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
-  ## needed for postinst with xdg-utils
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 mime/* \
-    ${pkgdir}/usr/share/gambas3/mime/
-  install -d -m755 ${pkgdir}/usr/share/gambas3/icons
-  install -D -m644 mime/application-x-gambas3.png \
-    ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
- 
-  cd gbc
-  make DESTDIR="${pkgdir}" uninstall
-}
-
-package_gambas3-devel() {
-  depends=('gambas3-runtime')
-  pkgdesc="Development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
-  depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
-           'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
-           'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
-  pkgdesc="Integrated Development Environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-#!! with the ide !!
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
-    ${pkgdir}/usr/share/applications/gambas3.desktop
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
-    ${pkgdir}/usr/share/pixmaps/gambas3.png
-
-  rm -r ${pkgdir}/usr/bin/gb*
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
-  depends=('gambas3-devel')
-  pkgdesc="Scripter and server programs support"
-  install=gambas3-script.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## needed for postinst with xdg-utils
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
-  install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
-  ##
-
-  rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
-  depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
-           'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
-           'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
-           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
-           'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
-           'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-           'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-  pkgdesc="Applications examples"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  rm -r ${pkgdir}/usr/{bin,lib}
-  rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
-}
-
-package_gambas3-gb-cairo() {
-  depends=('gambas3-runtime' 'cairo')
-  pkgdesc="Cairo component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-chart() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Chart component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
-  ##
-}
-
-package_gambas3-gb-compress() {
-  depends=('gambas3-runtime' 'bzip2' 'zlib')
-  pkgdesc="Compression support component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
-  ##
-}
-
-package_gambas3-gb-crypt() {
-  depends=('gambas3-runtime')
-  pkgdesc="MD5/DES crypting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db() {
-  depends=('gambas3-runtime')
-  pkgdesc="Database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
-  ##
-}
-
-package_gambas3-gb-db-form() {
-  depends=('gambas3-gb-db' 'gambas3-gb-form')
-  pkgdesc="Database form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
-  ##
-}
-
-package_gambas3-gb-db-mysql() {
-  depends=('gambas3-gb-db' 'libmysqlclient')
-  pkgdesc="MySQL database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-odbc() {
-  depends=('gambas3-gb-db' 'unixodbc')
-  pkgdesc="ODBC database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-postgresql() {
-  depends=('gambas3-gb-db' 'postgresql-libs')
-  pkgdesc="PostgreSQL database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-sqlite2() {
-  depends=('gambas3-gb-db' 'sqlite2')
-  pkgdesc="Sqlite2 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-db-sqlite3() {
-  depends=('gambas3-gb-db' 'sqlite3')
-  pkgdesc="Sqlite3 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-desktop() {
-  depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
-  pkgdesc="Desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-dbus() {
-  depends=('gambas3-runtime' 'dbus-core')
-  pkgdesc="DBUS component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-eval-highlight() {
-  depends=('gambas3-runtime')
-  pkgdesc="Expression evaluator highlight component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]*
-  ##
-}
-
-package_gambas3-gb-form() {
-  depends=('gambas3-gb-gui')
-  pkgdesc="Form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-dialog() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Form dialog component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-mdi() {
-  depends=('gambas3-gb-form')
-  pkgdesc="Form MDI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
-  ##
-}
-
-package_gambas3-gb-form-stock() {
-  depends=('gambas3-runtime')
-  pkgdesc="Default stock icons component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
-  ##
-}
-
-package_gambas3-gb-gtk() {
-  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
-  pkgdesc="GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gui() {
-  depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
-  pkgdesc="Automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
-  ##
-}
-
-package_gambas3-gb-image() {
-  depends=('gambas3-runtime')
-  pkgdesc="Image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
-  ##
-}
-
-package_gambas3-gb-image-effect() {
-  depends=('gambas3-gb-image')
-  pkgdesc="Image effect component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
-  ##
-}
-
-package_gambas3-gb-image-imlib() {
-  depends=('gambas3-gb-image' 'imlib2')
-  pkgdesc="Imlib component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-image-io() {
-  depends=('gambas3-gb-image' 'gdk-pixbuf2')
-  pkgdesc="Input/Output component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net() {
-  depends=('gambas3-runtime')
-  pkgdesc="Network component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-curl() {
-  depends=('gambas3-gb-net' 'curl')
-  pkgdesc="Curl component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-smtp() {
-  depends=('gambas3-runtime' 'glib2')
-  pkgdesc="SMTP component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl() {
-  depends=('gambas3-runtime' 'libgl' 'glew')
-  pkgdesc="OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl-glu() {
-  depends=('gambas3-gb-opengl')
-  pkgdesc="GL Utility component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-opengl-glsl() {
-  depends=('gambas3-gb-opengl')
-  pkgdesc="GLSL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-option() {
-  depends=('gambas3-runtime')
-  pkgdesc="Getopt component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
-  ##
-}
-
-package_gambas3-gb-pcre() {
-  depends=('gambas3-runtime' 'pcre')
-  pkgdesc="PCRE component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-pdf() {
-  depends=('gambas3-runtime' 'poppler')
-  pkgdesc="PDF component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4() {
-  depends=('gambas3-gb-image' 'qt')
-  pkgdesc="Qt4 toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-ext() {
-  depends=('gambas3-gb-qt4')
-  pkgdesc="Qt4 toolkit extended component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-opengl() {
-  depends=('gambas3-gb-qt4' 'libgl')
-  pkgdesc="Qt4 toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4-webkit() {
-  depends=('gambas3-gb-qt4' 'qtwebkit')
-  pkgdesc="Qt4 toolkit webkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-report() {
-  depends=('gambas3-gb-form' 'gambas3-gb-image-io')
-  pkgdesc="Report component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
-  ##
-}
-
-package_gambas3-gb-sdl() {
-  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
-  pkgdesc="SDL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-sdl-sound() {
-  depends=('gambas3-runtime' 'sdl_mixer')
-  pkgdesc="SDL sound component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-settings() {
-  depends=('gambas3-runtime')
-  pkgdesc="Setting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
-  ##
-}
-
-package_gambas3-gb-signal() {
-  depends=('gambas3-runtime')
-  pkgdesc="Signal component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
-  ##
-}
-
-package_gambas3-gb-v4l() {
-  depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
-  pkgdesc="Video4linux component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-vb() {
-  depends=('gambas3-runtime')
-  pkgdesc="VB transitional component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
-  ##
-}
-
-package_gambas3-gb-xml() {
-  depends=('gambas3-runtime' 'libxml2')
-  pkgdesc="XML component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
-  pkgdesc="XML-RPC component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
-  ##
-}
-
-package_gambas3-gb-xml-xslt() {
-  depends=('gambas3-gb-xml' 'libxslt')
-  pkgdesc="XML-XSLT component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-web() {
-  depends=('gambas3-runtime')
-  pkgdesc="CGI component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
-  ##
-}
diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install
deleted file mode 100644
index 6c8201a6a..000000000
--- a/community-staging/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-staging/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-staging/gpac/PKGBUILD b/community-staging/gpac/PKGBUILD
deleted file mode 100644
index 2e1960eee..000000000
--- a/community-staging/gpac/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 57689 2011-11-01 10:02:30Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpac
-pkgver=0.4.5
-pkgrel=9
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
-url="http://gpac.sourceforge.net"
-depends=('wxgtk' 'libmad' 'faad2' 'ffmpeg' 'freeglut')
-license=('LGPL')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        libpng14-infopp-null.patch openjpeg14.patch)
-sha1sums=('2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8'
-          '00ba08808ec46ef6b8301ede26e500b3449253c1'
-          '95747ca98cdf0efc33ec776764401f5a83818ab5')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  chmod +x configure
-  sed -i 's|--warn-common||' configure
-  sed -i 's#lib64#lib#g' configure
-  patch -p1 -i "${srcdir}/libpng14-infopp-null.patch"
-  patch -p1 -i "${srcdir}/openjpeg14.patch"
-	
-  export LDFLAGS=${LDFLAGS/,--as-needed/}
-  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/community-staging/gpac/libpng14-infopp-null.patch b/community-staging/gpac/libpng14-infopp-null.patch
deleted file mode 100644
index b02456557..000000000
--- a/community-staging/gpac/libpng14-infopp-null.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr gpac.orig/src/media_tools/img.c gpac/src/media_tools/img.c
---- gpac.orig/src/media_tools/img.c	2010-01-24 19:03:28.000000000 +0200
-+++ gpac/src/media_tools/img.c	2010-01-24 19:04:07.000000000 +0200
-@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
- 	/* Allocate/initialize the image information data.  REQUIRED */
- 	info_ptr = png_create_info_struct(png_ptr);
- 	if (info_ptr == NULL) {
--		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+		png_destroy_write_struct(&png_ptr, NULL);
- 		return GF_IO_ERR;
- 	}
- 	
diff --git a/community-staging/gpac/openjpeg14.patch b/community-staging/gpac/openjpeg14.patch
deleted file mode 100644
index 68a625eeb..000000000
--- a/community-staging/gpac/openjpeg14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=361359
-
-Index: gpac/modules/img_in/jp2_dec.c
-===================================================================
---- gpac.orig/modules/img_in/jp2_dec.c
-+++ gpac/modules/img_in/jp2_dec.c
-@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe
- 	return GF_OK;
- }
- 
-+char opj_version_buffer[500];
-+
- static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
- {
-+#ifndef OPENJPEG_VERSION
-+	snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version());
-+	return opj_version_buffer;
-+#else
- 	return "OpenJPEG "OPENJPEG_VERSION ;
-+#endif
- }
- 
- 
diff --git a/community-staging/kdenlive/PKGBUILD b/community-staging/kdenlive/PKGBUILD
deleted file mode 100644
index 4f45f1b4d..000000000
--- a/community-staging/kdenlive/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 57758 2011-11-02 11:31:56Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Zuf <kontakt.zuf@gmail.com>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-
-pkgname=kdenlive
-pkgver=0.8.2
-pkgrel=1
-pkgdesc="A non-linear video editor for Linux"
-arch=('i686' 'x86_64')
-url="http://www.kdenlive.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz'
-	 'libqzeitgeist')
-makedepends=('automoc4' 'cmake' 'gettext' 'mesa')
-install=kdenlive.install
-options=('docs')
-source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz"
-	glu.patch)
-md5sums=('0836842f489f6142cee101842ac76c54'
-         'fd6c5fe46419ee505c562363d41f6e9f')
-
-build() {
-  export LDFLAGS="$LDFLAGS -lX11"
-  cd "${srcdir}"
-  mkdir -p build
-  cd build
-  (cd ../kdenlive-${pkgver} && patch -p1 <$srcdir/glu.patch)
-  cmake ../kdenlive-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=/usr/lib \
-    -DLINK_LIBRARIES=-lX11
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/kdenlive/glu.patch b/community-staging/kdenlive/glu.patch
deleted file mode 100644
index a4c2f21fb..000000000
--- a/community-staging/kdenlive/glu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur kdenlive-0.8.2/src/videoglwidget.cpp kdenlive-0.8.2.my/src/videoglwidget.cpp
---- kdenlive-0.8.2/src/videoglwidget.cpp	2011-10-31 22:46:21.000000000 +0400
-+++ kdenlive-0.8.2.my/src/videoglwidget.cpp	2011-11-02 14:54:10.000000000 +0400
-@@ -2,6 +2,7 @@
- #include <QtGui>
- #include <QtOpenGL>
- #include "videoglwidget.h"
-+#include <GL/glu.h>
- 
- #ifndef GL_TEXTURE_RECTANGLE_EXT
- #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV
diff --git a/community-staging/kdenlive/kdenlive.install b/community-staging/kdenlive/kdenlive.install
deleted file mode 100644
index a3489ee9d..000000000
--- a/community-staging/kdenlive/kdenlive.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/libextractor/PKGBUILD b/community-staging/libextractor/PKGBUILD
deleted file mode 100644
index 208f92552..000000000
--- a/community-staging/libextractor/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 58157 2011-11-07 11:14:51Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=libextractor
-pkgver=0.6.2
-pkgrel=5
-pkgdesc="A library used to extract meta-data from files of arbitrary type"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://gnunet.org/libextractor/"
-depends=('libvorbis' 'libtool' 'gtk2' 'libgsf' 'libmpeg2' 'texinfo')
-makedepends=('flac' 'poppler' 'exiv2' 'qt')
-optdepends=('flac'
-	    'poppler'
-	    'exiv2'
-	    'qt')
-options=('!libtool' '!makeflags')
-install=libextractor.install
-source=(http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4b2af1167061430d58a101d5dfc6b4c7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-shared --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/share/info/dir
-}
diff --git a/community-staging/libextractor/libextractor.install b/community-staging/libextractor/libextractor.install
deleted file mode 100644
index 24d668af5..000000000
--- a/community-staging/libextractor/libextractor.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(extractor.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/community-staging/lightspark/llvm29.diff b/community-staging/lightspark/llvm29.diff
deleted file mode 100644
index f859852af..000000000
--- a/community-staging/lightspark/llvm29.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.old	2011-11-01 22:07:52.475608726 +0000
-+++ CMakeLists.txt	2011-11-01 22:08:52.046241925 +0000
-@@ -152,7 +152,8 @@
- 	MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!")
- ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8)
- IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
--	MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!")
-+	#MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!")
-+	ADD_DEFINITIONS(-DLLVM_29)
- ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
- IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8)
- 	ADD_DEFINITIONS(-DLLVM_28)
diff --git a/community-staging/mplayer2/PKGBUILD b/community-staging/mplayer2/PKGBUILD
deleted file mode 100644
index ca9d5e40a..000000000
--- a/community-staging/mplayer2/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 57873 2011-11-04 02:20:06Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Bartek Piotrowski <barthalion@gmail.com>
-
-pkgname=mplayer2
-pkgver=2.0.20111101
-pkgrel=1
-pkgdesc="A movie player"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.mplayer2.org/"
-depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2'
-         'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad'
-         'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa')
-makedepends=('live-media' 'mesa' 'unzip' 'yasm' 'git')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-provides=('mplayer')
-conflicts=('mplayer')
-#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d')
-options=('!emptydirs')
-
-# source PKGBUILD && mksource
-mksource() {
-  _gitroot="git://git.mplayer2.org/mplayer2.git"
-  _gitname="${pkgname}-${pkgver}"
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  tar -cJvf ${_gitname}.tar.xz ${_gitname}
-  rm -fr ${_gitname}
-}
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr \
-                --enable-runtime-cpudetection \
-                --disable-arts \
-                --disable-speex \
-                --disable-openal \
-                --disable-libdv \
-                --disable-musepack \
-                --disable-esd \
-                --disable-mga \
-                --language=all \
-                --enable-translation \
-                --confdir=/etc/mplayer
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/
-    install -dm755 "${pkgdir}"/usr/share/mplayer/
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf
-
-    install -dm755 "${pkgdir}"/usr/share/applications/
-    install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/
-}
diff --git a/community-staging/pdf2djvu/PKGBUILD b/community-staging/pdf2djvu/PKGBUILD
deleted file mode 100644
index c7ed3f7d3..000000000
--- a/community-staging/pdf2djvu/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 58155 2011-11-07 11:04:26Z jelle $
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-
-pkgname=pdf2djvu
-pkgver=0.7.11
-pkgrel=2
-pkgdesc="Creates DjVu files from PDF files"
-arch=('i686' 'x86_64')
-url="http://pdf2djvu.googlecode.com"
-license=('GPL')
-depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs')
-makedepends=('pstreams')
-source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz")
-md5sums=('cdc0cbb46512aaf7109d6ebc7aef1a7a')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make install DESTDIR=${pkgdir}
-    install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
-}
-md5sums=('37c3d5a31c155bc65a39912da4c6bce1')
diff --git a/community-staging/qmmp/PKGBUILD b/community-staging/qmmp/PKGBUILD
deleted file mode 100644
index a03104add..000000000
--- a/community-staging/qmmp/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-#$Id: PKGBUILD 57919 2011-11-04 13:16:35Z jelle $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=qmmp
-pkgver=0.5.2
-pkgrel=2
-pkgdesc="Qt4 based audio-player"
-arch=('i686' 'x86_64')
-url="http://qmmp.ylsoftware.com/"
-license=('GPL')
-depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt' 'taglib' 'xdg-utils')
-makedepends=('cmake'  'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack')
-optdepends=('flac: native FLAC support'
-            'jack: JACK sound output'
-            'libmpcdec: Musepack support'
-            'pulseaudio: PulseAudio output'
-            'libcdio: Compact Disc input and control support'
-            'libcddb: CDDB server support'
-            'libmms: MMS stream protocol support'
-            'libmodplug: MOD playing library'
-            'libsndfile: sampled sound support'
-            'ffmpeg' 'libsamplerate' 'wavpack')
-install=$pkgname.install
-source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/qmmp/qmmp.changelog b/community-staging/qmmp/qmmp.changelog
deleted file mode 100644
index 31050d69e..000000000
--- a/community-staging/qmmp/qmmp.changelog
+++ /dev/null
@@ -1,47 +0,0 @@
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.2-1
-
-2011-07-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.1-1
-
-2011-04-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.0-1
-
-2011-02-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.4.4-1
-
-2010-11-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.3
-
-2010-09-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.2
-
-2010-06-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.1
-
-2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.0
-
-2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.4
-
-2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.3
-
-2010-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.2
-
-2009-07-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.0
-
-2009-03-30 Giovanni Scafora <giovanni@archlinux.org>
-	* Fixed x86_64 build
-
-2009-03-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.4
-
-2008-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.3
-
-2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.2
diff --git a/community-staging/qmmp/qmmp.install b/community-staging/qmmp/qmmp.install
deleted file mode 100644
index 4c0972beb..000000000
--- a/community-staging/qmmp/qmmp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/acpitool/PKGBUILD b/community-testing/acpitool/PKGBUILD
deleted file mode 100644
index d9b079988..000000000
--- a/community-testing/acpitool/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 57685 2011-11-01 09:10:22Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Gerhard Brauer <gerhard.brauer@web.de>
-# Contributor: Milosz Piglas <archeofuture@gmail.com>
-
-pkgname=acpitool
-pkgver=0.5.1
-pkgrel=4
-pkgdesc="ACPI client - replacement for apm tool"
-url="http://sourceforge.net/projects/acpitool/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gcc-libs')
-source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2
-	linux-3.0.patch
-	sysfs-battery.patch)
-md5sums=('9e4ec55201be0be71ffbc56d38b42b57'
-         'eb149edb32be6cdf20a7d16beb3e9f70'
-         '8211c37dbf888b76388699b7c6098503')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/linux-3.0.patch
-  patch -p1 <$srcdir/sysfs-battery.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix="$pkgdir/usr" install
-}
diff --git a/community-testing/acpitool/linux-3.0.patch b/community-testing/acpitool/linux-3.0.patch
deleted file mode 100644
index ba454a0c2..000000000
--- a/community-testing/acpitool/linux-3.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -wbBur acpitool-0.5.1/src/acpitool.cpp acpitool-0.5.1.my/src/acpitool.cpp
---- acpitool-0.5.1/src/acpitool.cpp	2009-08-13 23:37:48.000000000 +0400
-+++ acpitool-0.5.1.my/src/acpitool.cpp	2011-08-11 21:53:17.000000000 +0400
-@@ -205,8 +205,12 @@
- 	Kernel_24 = 1;           
- 	Kernel_26 = 0;
-     }
--        
--    if(strncmp(str,"2.6",3)==0)
-+    else if(strncmp(str,"2.6",3)==0)
-+    {
-+	Kernel_24 = 0;
-+	Kernel_26 = 1;
-+    }
-+    else
-     {
- 	Kernel_24 = 0;           
- 	Kernel_26 = 1;
diff --git a/community-testing/acpitool/sysfs-battery.patch b/community-testing/acpitool/sysfs-battery.patch
deleted file mode 100644
index 11a58ecc5..000000000
--- a/community-testing/acpitool/sysfs-battery.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur acpitool-0.5.1/src/battery.cpp acpitool-0.5.1.my/src/battery.cpp
---- acpitool-0.5.1/src/battery.cpp	2009-08-13 23:42:43.000000000 +0400
-+++ acpitool-0.5.1.my/src/battery.cpp	2011-11-01 13:07:20.000000000 +0400
-@@ -781,45 +781,7 @@
- 
- int Count_Batteries_ProcFS()
- {
--    DIR *battery_dir;
--    char *name, *dirname;
--    int t = 0;
--       
--    dirname = "/proc/acpi/battery/";    
--    battery_dir = opendir(dirname);
--    if(battery_dir)                  
--    {
--	struct dirent **namelist;
--	int n = 0;
--
--	n = scandir(dirname, &namelist, 0, alphasort);
--	if(n<0)
--	  t = -1;
--	else
--	{
--	    while(n--)
--	    {
--		name = namelist[n]->d_name;
--		// skip . and .. //
--		if (!strcmp (".", name) || !strcmp ("..", name))
--		{
--		    // do nothing
--		}
--		else
--		{
--		    t++;
--		}
--		free(namelist[n]);
--	    }
--	    free(namelist);
--	}
--    }
--    else
--    {
--	t = 0;
--    }
--    closedir(battery_dir);
--    return t;
-+    return 0;
- }
- 
- 
diff --git a/community-testing/cherokee/PKGBUILD b/community-testing/cherokee/PKGBUILD
deleted file mode 100644
index 07cd74624..000000000
--- a/community-testing/cherokee/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 57980 2011-11-05 11:37:54Z ibiru $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=cherokee
-pkgver=1.2.101
-pkgrel=2
-pkgdesc="A very fast, flexible and easy to configure Web Server"
-arch=('i686' 'x86_64')
-url="http://www.cherokee-project.com/"
-license=('GPL2')
-depends=('openssl' 'pcre')
-makedepends=('python2' 'gettext' 'libldap' 'pam' 'libmysqlclient'
-             'ffmpeg' 'geoip')
-optdepends=('python2: cherokee-admin (administrative web interface)'
-            'libldap: ldap validator'
-            'pam: pam validator'
-            'libmysqlclient: mysql validator'
-            'ffmpeg: Audio/Video streaming handler'
-            'geoip: GeoIP rule module'
-            'rrdtool: RRDtool based information collector')
-backup=('etc/cherokee/cherokee.conf'
-        'etc/logrotate.d/cherokee'
-        'etc/pam.d/cherokee')
-options=('!libtool')
-source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
-        cherokee.rc
-        cherokee.logrotate
-        fix-ctk-path-handler-match.patch)
-sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8'
-            '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86'
-            '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e'
-            '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Fix path matching bug in CTK apps (e.g. market)
-  patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch"
-
-  # Use subdirectory for logs
-  sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
-
-  # Use Python 2 in cherokee-admin
-  sed -i 's/"python"/"python2"/' cherokee/main_admin.c
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static \
-    --with-wwwroot=/srv/http \
-    --with-wwwuser=http \
-    --with-wwwgroup=http \
-    --with-python=python2 \
-    --enable-os-string="Arch Linux"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir" install
-
-  # PAM configuration file for cherokee
-  install -D -m644 pam.d_cherokee "$pkgdir/etc/pam.d/$pkgname"
-
-  # Fix ownership of /var/lib/cherokee/graphs
-  chown -R http:http "$pkgdir/var/lib/$pkgname/graphs"
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' \
-    "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \
-    "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}}
-  sed -i -r "s/['\"]python/&2/g" \
-    "$pkgdir/usr/share/cherokee/admin/wizards/django.py"
-
-  # Compile Python scripts
-  python2 -m compileall "$pkgdir"
-  python2 -O -m compileall "$pkgdir"
-
-  install -d -o http -g http "$pkgdir/var/log/$pkgname"
-  install -D "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
-
-  # Cleanup
-  rm -rf "$pkgdir/srv"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/cherokee/cherokee.logrotate b/community-testing/cherokee/cherokee.logrotate
deleted file mode 100644
index 19207fd02..000000000
--- a/community-testing/cherokee/cherokee.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/cherokee/*.error /var/log/cherokee/*.access {
-   daily
-   rotate 14
-   compress
-   sharedscripts
-   postrotate
-      /bin/kill -HUP `cat /var/run/cherokee.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/community-testing/cherokee/cherokee.rc b/community-testing/cherokee/cherokee.rc
deleted file mode 100755
index 2d413dc13..000000000
--- a/community-testing/cherokee/cherokee.rc
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=cherokee
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-    if [ ! -f /var/run/$daemon_name.pid ] && $daemon_name -d &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill $PID &>/dev/null; then
-      rm_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  reload)
-    stat_busy "Reloading $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill -HUP $PID &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    stat_busy "Restarting $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill -USR1 $PID &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/community-testing/cherokee/fix-ctk-path-handler-match.patch b/community-testing/cherokee/fix-ctk-path-handler-match.patch
deleted file mode 100644
index abd20c5ef..000000000
--- a/community-testing/cherokee/fix-ctk-path-handler-match.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py
---- cherokee-1.2.99.orig/admin/CTK/CTK/Server.py	2011-06-06 14:17:35.000000000 +0300
-+++ cherokee-1.2.99/admin/CTK/CTK/Server.py	2011-09-16 03:31:06.000000000 +0300
-@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler)
-         my_thread.scgi_conn   = self
-         my_thread.request_url = url
- 
-+        # Drop the query string before matching against the handlers
-+        path = url.split('?', 1)[0]
-+
-         for published in server._web_paths:
--            if re.match (published._regex, url):
-+            if re.match (published._regex, path):
-                 # POST
-                 if published._method == 'POST':
-                     post = self._process_post()
diff --git a/community-testing/deadbeef/PKGBUILD b/community-testing/deadbeef/PKGBUILD
deleted file mode 100644
index 815dfd98f..000000000
--- a/community-testing/deadbeef/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 57984 2011-11-05 11:38:14Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.5.1
-pkgrel=3
-pkgdesc='An audio player for GNU/Linux based on GTK2.'
-arch=('i686' 'x86_64')
-url='http://deadbeef.sourceforge.net'
-license=('GPL2')
-depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
-             'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
-             'libsamplerate')
-optdepends=('libsamplerate: for Resampler plugin'
-            'libvorbis: for Ogg Vorbis playback'
-            'libmad: for MP1/MP2/MP3 playback'
-            'flac: for FLAC playback'
-            'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
-            'imlib2: for artwork plugin'
-            'wavpack: for WavPack playback'
-            'libsndfile: for Wave playback'
-            'libcdio: audio cd plugin'
-            'libcddb: audio cd plugin'
-            'ffmpeg: for WMA, AA, OMA, AC, etc.'
-            'faad2: for AAC/MP4 support'
-            'dbus: for OSD notifications support'
-            'pulseaudio: for PulseAudio output plugin'
-            'libx11: for global hotkeys plugin'
-            'zlib: for Audio Overload plugin'
-            'libzip: for vfs_zip plugin')
-options=('!libtool')
-install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/ffmpeg.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
-md5sums=('be8359d1bd9cf7679cf2ca748996e726'
-         '6cc7623734af310095534c361c9f64e8')
diff --git a/community-testing/deadbeef/deadbeef.install b/community-testing/deadbeef/deadbeef.install
deleted file mode 100644
index eaf1b9a69..000000000
--- a/community-testing/deadbeef/deadbeef.install
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgname=deadbeef
-
-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/community-testing/deadbeef/ffmpeg.patch b/community-testing/deadbeef/ffmpeg.patch
deleted file mode 100644
index 925b84408..000000000
--- a/community-testing/deadbeef/ffmpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c
---- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c	2011-05-22 13:58:53.000000000 +0000
-+++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c	2011-11-01 10:38:11.447669741 +0000
-@@ -140,7 +140,12 @@
-     for (i = 0; i < info->fctx->nb_streams; i++)
-     {
-         info->ctx = info->fctx->streams[i]->codec;
--        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (info->ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+		            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             info->codec = avcodec_find_decoder (info->ctx->codec_id);
-             if (info->codec != NULL) {
-@@ -490,7 +495,12 @@
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+		            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
-@@ -745,7 +755,12 @@
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type == 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+			            AVMEDIA_TYPE_AUDIO)
-+#else
-+		            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL)
diff --git a/community-testing/dvdstyler/PKGBUILD b/community-testing/dvdstyler/PKGBUILD
deleted file mode 100644
index 13ddca6a2..000000000
--- a/community-testing/dvdstyler/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 57986 2011-11-05 11:38:22Z ibiru $
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=dvdstyler
-pkgver=2.0
-pkgrel=2
-pkgdesc="Cross-platform DVD authoring application"
-arch=('i686' 'x86_64')
-url="http://www.dvdstyler.de/"
-license=('GPL')
-depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui')
-makedepends=('zip' 'xmlto' 'docbook-xsl')
-optdepends=('dvdisaster: ECC support')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2)
-sha1sums=('21bb4e25c851e70cdd3ce37f3e319c71e78f74a6')
-
-build() {
-  cd "${srcdir}/DVDStyler-${pkgver}"
-  sed -i 's/rmdir "$$t"//' docs/Makefile.in
-  sed -i 's/vsink_buffer.h/buffersink.h/' src/mediatrc_ffmpeg.cpp
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/DVDStyler-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/electricsheep/PKGBUILD b/community-testing/electricsheep/PKGBUILD
deleted file mode 100644
index d82e6cc2f..000000000
--- a/community-testing/electricsheep/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 57988 2011-11-05 11:38:29Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=electricsheep
-pkgver=2.7b12
-pkgrel=4
-pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
-arch=('i686' 'x86_64')
-url="http://community.electricsheep.org/"
-license=('GPL')
-depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
-makedepends=('xscreensaver')
-optdepends=('xscreensaver: to use electricsheep with xscreensaver')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        electricsheep-ffmpeg.patch)
-sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32'
-          'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/share/applications/screensavers"
-  install -d "${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver"
-  make DESTDIR="${pkgdir}" GNOME_SCREENSAVER_DATADIR="${pkgdir}/usr/share/applications/screensavers" \
-    GNOME_SCREENSAVER_PRIVEXEDIR="${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" install
-  install -D -m644 electricsheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
-  install -D -m644 electricsheep.xml "${pkgdir}/usr/share/xscreensaver/config/electricsheep.xml"
-  install -D -m755 electricsheep-saver "${pkgdir}/usr/bin/electricsheep-saver"
-}
diff --git a/community-testing/electricsheep/electricsheep-ffmpeg.patch b/community-testing/electricsheep/electricsheep-ffmpeg.patch
deleted file mode 100644
index b04cf41b0..000000000
--- a/community-testing/electricsheep/electricsheep-ffmpeg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
---- electricsheep-2.7b12.orig/electricsheep.c	2011-10-31 22:36:30.000000000 -0400
-+++ electricsheep-2.7b12/electricsheep.c	2011-10-31 22:40:04.000000000 -0400
-@@ -662,7 +662,7 @@
-     input_stream_index = -1;
-     for (j = 0; j < ictx->nb_streams; j++) {
- 	AVCodecContext *enc = ictx->streams[j]->codec;
--	if (CODEC_TYPE_VIDEO == enc->codec_type) {
-+	if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
- 	    input_stream_index = j;
- 	    break;
- 	}
-@@ -730,7 +730,7 @@
- 	av_init_packet(&opkt);
- 	if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
- 			     &opkt.data, &opkt.size, ipkt.data, ipkt.size,
--			     ipkt.flags & PKT_FLAG_KEY))
-+			     ipkt.flags & AV_PKT_FLAG_KEY))
- 	    opkt.destruct= av_destruct_packet;
- 		
- 	if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
-diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
---- electricsheep-2.7b12.orig/electricsheep.c	2011-11-01 00:21:51.000000000 -0400
-+++ electricsheep-2.7b12/electricsheep.c	2011-11-01 00:25:10.000000000 -0400
-@@ -686,9 +686,9 @@
- 	    }
- 	}
- 
--	output_ctx = av_alloc_format_context();
-+	output_ctx = avformat_alloc_context();
- 
--	ofmt = guess_format(NULL, fname, NULL);
-+	ofmt = av_guess_format(NULL, fname, NULL);
- 	if (!ofmt) {
- 	    fprintf(logout, "could not determine format from %s.\n", fname);
- 	    exit(1);
diff --git a/community-testing/ffmpeg2theora/PKGBUILD b/community-testing/ffmpeg2theora/PKGBUILD
deleted file mode 100644
index 7a371dce2..000000000
--- a/community-testing/ffmpeg2theora/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 57990 2011-11-05 11:38:39Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
-
-pkgname=ffmpeg2theora
-pkgver=0.28
-pkgrel=2
-pkgdesc="A simple converter to create Ogg Theora files"
-arch=('i686' 'x86_64')
-url="http://www.v2v.cc/~j/ffmpeg2theora/"
-license=('GPL3')
-depends=('ffmpeg')
-makedepends=('pkgconfig' 'scons')
-changelog=$pkgname.changelog
-source=(http://www.v2v.cc/~j/${pkgname}/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  scons
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man"
-}
diff --git a/community-testing/ffmpeg2theora/ffmpeg2theora.changelog b/community-testing/ffmpeg2theora/ffmpeg2theora.changelog
deleted file mode 100644
index adbe34807..000000000
--- a/community-testing/ffmpeg2theora/ffmpeg2theora.changelog
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-10-09  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
-
-	* ffmpeg2theora 0.28-1
-	* Upstream update
-
-2010-06-25  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.27-1
-	* Upstream update
-
-2010-02-05  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.26-1
-	* Upstream update
-	* Updated license
-	* Updated source url
-
-2010-01-10  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.25-1
-	* Upstream update
-	* Built against ffmpeg 20100108
-
-2009-06-06  Eric Belanger  <eric@archlinux.org>
-
-	* ffmpeg2theora 0.24-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD
deleted file mode 100644
index 68f826412..000000000
--- a/community-testing/gnash/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgbase=gnash
-pkgname=(gnash-common gnash-gtk)
-pkgver=0.8.9
-pkgrel=5
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/gnash/"
-license=(GPL3)
-makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
-             speex fontconfig libva ffmpeg libxinerama
-             gstreamer0.10-base gstreamer0.10-ffmpeg
-             gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils
-             pkgconfig boost)
-options=(!libtool !emptydirs)
-source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        gentoo-ffmpeg-0.8.patch)
-md5sums=('5b2be6b04a1bcc5fb404cc377034499e'
-         '98dec9a5c1b1084245a3f46b4022a6e2')
-
-build() {
-  cd "$srcdir/gnash-$pkgver"
-
-  # Consolidated gentoo patches for ffmpeg compatibility
-  # as of 2011-10-31
-  patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch"
-  ./autogen.sh
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-plugins-install=system \
-    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
-    --enable-gui=sdl,gtk \
-    --enable-renderer=agg \
-    --enable-media=gst,ffmpeg \
-    --enable-hwaccel=vaapi
-
-  make
-}
-
-package_gnash-common() {
-  pkgdesc="A GNU Flash movie player"
-  depends=(curl giflib libldap sdl agg libjpeg libpng libtool
-           speex fontconfig libva ffmpeg libxinerama
-           gstreamer0.10-base gstreamer0.10-ffmpeg
-           boost-libs)
-  backup=(etc/gnashrc)
-
-  cd "$srcdir/gnash-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # Split gnash-gtk
-  mkdir -p "$srcdir"/gtk/{bin,man1,share}
-  mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/"
-  mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/"
-  mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/"
-  mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/"
-}
-
-package_gnash-gtk() {
-  pkgdesc="A GNU Flash movie player"
-  depends=("gnash-common=$pkgver"
-            gtk2 libldap hicolor-icon-theme desktop-file-utils)
-  install=gnash-gtk.install
-  backup=(etc/gnashpluginrc)
-
-  cd "$srcdir/gnash-$pkgver"
-
-  make DESTDIR="$pkgdir" install-plugin
-
-  install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}}
-  mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/"
-  mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/"
-  mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/"
-  mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/"
-}
diff --git a/community-testing/gnash/gentoo-ffmpeg-0.8.patch b/community-testing/gnash/gentoo-ffmpeg-0.8.patch
deleted file mode 100644
index d74bcc8e0..000000000
--- a/community-testing/gnash/gentoo-ffmpeg-0.8.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
---- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-10-31 17:25:56.057379760 +0100
-@@ -29,7 +29,7 @@
- 
- //#define GNASH_DEBUG_AUDIO_DECODING
- 
--#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2
-+#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3
- 
- namespace gnash {
- namespace media {
-@@ -549,8 +549,12 @@
- #endif
- 
-     // older ffmpeg versions didn't accept a const input..
-+    AVPacket pkt;
-+    av_init_packet(&pkt);
-+    pkt.data = (uint8_t*) input;
-+    pkt.size = inputSize;
-     int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize,
--                                   input, inputSize);
-+                                   &pkt);
- 
- #ifdef GNASH_DEBUG_AUDIO_DECODING
-     log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) "
-@@ -658,13 +662,13 @@
- {
-     if ( _needsParsing )
-     {
--        return av_parser_parse(_parser, _audioCodecCtx,
-+        return av_parser_parse2(_parser, _audioCodecCtx,
-                     // as of 2008-10-28 SVN, ffmpeg doesn't
-                     // accept a pointer to pointer to const..
-                     const_cast<boost::uint8_t**>(outFrame),
-                     outFrameSize,
-                     input, inputSize,
--                    0, 0); // pts & dts
-+                    0, 0, AV_NOPTS_VALUE); // pts & dts
-     }
-     else
-     {
-diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
---- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp	2011-10-31 17:25:51.210668136 +0100
-@@ -46,8 +46,10 @@
- {
-   if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) {
-     if ( ! _context ) {
--      _context = audio_resample_init( 
--		2, ctx->channels, 44100, ctx->sample_rate 
-+      _context = av_audio_resample_init( 
-+		2, ctx->channels, 44100, ctx->sample_rate,
-+		AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
-+		16, 10, 0, 0.8
- 	);
-     }
- 
-diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp
---- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp	2011-10-31 17:25:57.720728522 +0100
-@@ -387,7 +387,7 @@
-     
-     log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d",
-         _inputFmt->name, _formatCtx->nb_streams);
--    
-+    /*
-     if ( _formatCtx->title[0] )
-         log_debug(_("  Title:'%s'"), _formatCtx->title);
-     if ( _formatCtx->author[0] )
-@@ -398,7 +398,7 @@
-         log_debug(_("  Comment:'%s'"), _formatCtx->comment);
-     if ( _formatCtx->album[0] )
-         log_debug(_("  Album:'%s'"), _formatCtx->album);
--    
-+    */
-     // Find first audio and video stream
-     for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++)
- 	{
-@@ -415,7 +415,7 @@
- 	    }
- 	    
- 	    switch (enc->codec_type) {
--	    case CODEC_TYPE_AUDIO:
-+	    case AVMEDIA_TYPE_AUDIO:
- 		if (_audioStreamIndex < 0) {
- 		    _audioStreamIndex = i;
- 		    _audioStream = _formatCtx->streams[i];
-@@ -425,7 +425,7 @@
- 		}
- 		break;
- 		
--	    case CODEC_TYPE_VIDEO:
-+	    case AVMEDIA_TYPE_VIDEO:
- 		if (_videoStreamIndex < 0) {
- 		    _videoStreamIndex = i;
- 		    _videoStream = _formatCtx->streams[i];
-diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
---- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2011-10-31 17:25:54.590699488 +0100
-@@ -356,8 +356,12 @@
- 
-     int bytes = 0;    
-     // no idea why avcodec_decode_video wants a non-const input...
--    avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes,
--            input, input_size);
-+    AVPacket pkt;
-+    av_init_packet(&pkt);
-+    pkt.data = (uint8_t*) input;
-+    pkt.size = input_size;
-+    avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes,
-+            &pkt);
-     
-     if (!bytes) {
-         log_error("Decoding of a video frame failed");
-diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4
---- gnash-0.8.9/macros/ffmpeg.m4	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-ff/macros/ffmpeg.m4	2011-10-31 17:25:49.700654130 +0100
-@@ -22,6 +22,7 @@
-   backupLIBS="$LIBS"
-   backupCFLAGS="$CFLAGS"
-   avcodec_h=""
-+  avcodec_version_h=""
-   ffmpeg_top_incl=""
- 
-   dnl If the user specify an path to include headers from, we assume it's the full
-@@ -46,6 +47,9 @@
-       else
-         AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header])
-       fi
-+      if test -f ${with_ffmpeg_incl}/version.h; then
-+        avcodec_version_h=${with_ffmpeg_incl}/version.h
-+      fi
-     fi
-   ])
- 
-@@ -66,6 +70,9 @@
-           if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
-             ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`"
-             avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h"
-+            if test -f ${ffmpeg_top_incl}/${i}/version.h; then
-+              avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
-+            fi
-             break
-           fi
-         done
-@@ -83,6 +90,9 @@
-         if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
-           ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`"
-           avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h
-+          if test -f ${ffmpeg_top_incl}/${i}/version.h; then
-+            avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
-+          fi
-           break
-         fi
-       done
-@@ -182,14 +192,24 @@
-   dnl a modified form of grepping may be better, making sure all old kinds of
-   dnl version numbering fail gracefully.
- 
-+  versionfile=""
-+
-   dnl Check avcodec version number, if it was found
--  if test x"${avcodec_h}" != x; then
-+  if test x"${avcodec_version_h}" != x; then
-+    versionfile=${avcodec_version_h}
-+  else
-+    if test x"${avcodec_h}" != x; then
-+      versionfile=${avcodec_h}
-+    fi
-+  fi
-+
-+  if test x"${versionfile}" != x; then
- 
-     AC_MSG_CHECKING([ffmpeg version])
- 
--    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
--    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
--    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
-+    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"`
- 
-     if test x"${ffmpeg_major_version}" != x ; then
- 
-@@ -198,15 +218,15 @@
-     else
- 
-       dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
--      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"`
-+      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"`
- 
-       if test x"${ffmpeg_version}" = x ; then
- 
-         dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
--        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
-+        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
- 
-         if test x"${ffmpeg_version}" = x ; then
--          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'`
-+          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'`
-         fi
-       fi
- 
diff --git a/community-testing/gnash/gnash-gtk.install b/community-testing/gnash/gnash-gtk.install
deleted file mode 100644
index c317fbaca..000000000
--- a/community-testing/gnash/gnash-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/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD
deleted file mode 100644
index 065728481..000000000
--- a/community-testing/gpac/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 57994 2011-11-05 11:38:57Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpac
-pkgver=0.4.5
-pkgrel=9
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
-url="http://gpac.sourceforge.net"
-depends=('wxgtk' 'libmad' 'faad2' 'ffmpeg' 'freeglut')
-license=('LGPL')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        libpng14-infopp-null.patch openjpeg14.patch)
-sha1sums=('2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8'
-          '00ba08808ec46ef6b8301ede26e500b3449253c1'
-          '95747ca98cdf0efc33ec776764401f5a83818ab5')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  chmod +x configure
-  sed -i 's|--warn-common||' configure
-  sed -i 's#lib64#lib#g' configure
-  patch -p1 -i "${srcdir}/libpng14-infopp-null.patch"
-  patch -p1 -i "${srcdir}/openjpeg14.patch"
-	
-  export LDFLAGS=${LDFLAGS/,--as-needed/}
-  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/community-testing/gpac/libpng14-infopp-null.patch b/community-testing/gpac/libpng14-infopp-null.patch
deleted file mode 100644
index b02456557..000000000
--- a/community-testing/gpac/libpng14-infopp-null.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr gpac.orig/src/media_tools/img.c gpac/src/media_tools/img.c
---- gpac.orig/src/media_tools/img.c	2010-01-24 19:03:28.000000000 +0200
-+++ gpac/src/media_tools/img.c	2010-01-24 19:04:07.000000000 +0200
-@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
- 	/* Allocate/initialize the image information data.  REQUIRED */
- 	info_ptr = png_create_info_struct(png_ptr);
- 	if (info_ptr == NULL) {
--		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+		png_destroy_write_struct(&png_ptr, NULL);
- 		return GF_IO_ERR;
- 	}
- 	
diff --git a/community-testing/gpac/openjpeg14.patch b/community-testing/gpac/openjpeg14.patch
deleted file mode 100644
index 68a625eeb..000000000
--- a/community-testing/gpac/openjpeg14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=361359
-
-Index: gpac/modules/img_in/jp2_dec.c
-===================================================================
---- gpac.orig/modules/img_in/jp2_dec.c
-+++ gpac/modules/img_in/jp2_dec.c
-@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe
- 	return GF_OK;
- }
- 
-+char opj_version_buffer[500];
-+
- static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
- {
-+#ifndef OPENJPEG_VERSION
-+	snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version());
-+	return opj_version_buffer;
-+#else
- 	return "OpenJPEG "OPENJPEG_VERSION ;
-+#endif
- }
- 
- 
diff --git a/community-testing/kdenlive/PKGBUILD b/community-testing/kdenlive/PKGBUILD
deleted file mode 100644
index 1d4ec4dd2..000000000
--- a/community-testing/kdenlive/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 58030 2011-11-05 13:50:01Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Zuf <kontakt.zuf@gmail.com>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-
-pkgname=kdenlive
-pkgver=0.8.2
-pkgrel=1
-pkgdesc="A non-linear video editor for Linux"
-arch=('i686' 'x86_64')
-url="http://www.kdenlive.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz'
-	 'libqzeitgeist')
-makedepends=('automoc4' 'cmake' 'gettext' 'mesa')
-install=kdenlive.install
-options=('docs')
-source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz"
-	glu.patch)
-md5sums=('0836842f489f6142cee101842ac76c54'
-         'fd6c5fe46419ee505c562363d41f6e9f')
-
-build() {
-  export LDFLAGS="$LDFLAGS -lX11"
-  cd "${srcdir}"
-  mkdir -p build
-  cd build
-  (cd ../kdenlive-${pkgver} && patch -p1 <$srcdir/glu.patch)
-  cmake ../kdenlive-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=/usr/lib \
-    -DLINK_LIBRARIES=-lX11
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/kdenlive/glu.patch b/community-testing/kdenlive/glu.patch
deleted file mode 100644
index a4c2f21fb..000000000
--- a/community-testing/kdenlive/glu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur kdenlive-0.8.2/src/videoglwidget.cpp kdenlive-0.8.2.my/src/videoglwidget.cpp
---- kdenlive-0.8.2/src/videoglwidget.cpp	2011-10-31 22:46:21.000000000 +0400
-+++ kdenlive-0.8.2.my/src/videoglwidget.cpp	2011-11-02 14:54:10.000000000 +0400
-@@ -2,6 +2,7 @@
- #include <QtGui>
- #include <QtOpenGL>
- #include "videoglwidget.h"
-+#include <GL/glu.h>
- 
- #ifndef GL_TEXTURE_RECTANGLE_EXT
- #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV
diff --git a/community-testing/kdenlive/kdenlive.install b/community-testing/kdenlive/kdenlive.install
deleted file mode 100644
index a3489ee9d..000000000
--- a/community-testing/kdenlive/kdenlive.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/libdlna/PKGBUILD b/community-testing/libdlna/PKGBUILD
deleted file mode 100644
index 89555cea3..000000000
--- a/community-testing/libdlna/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 57996 2011-11-05 11:39:05Z ibiru $
-# Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> 
-# Contributor: kastor <kastor@fobos.org.ar>
-pkgname=libdlna
-pkgver=0.2.3
-pkgrel=9
-pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards "
-url="http://libdlna.geexbox.org"
-license=("LGPL")
-arch=('i686' 'x86_64')
-options=('!libtool' '!makeflags')  # not parallel safe, error find -ldlna  
-makedepends=('ctags')
-depends=('glibc' 'ffmpeg')
-source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "libdlna-0.2.3-libavcodec-libavformat-include-paths.patch" "ffmpeg-0.8.patch")
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-#  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c 
-#  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c 
-  ./configure --prefix=/usr --includedir=/usr/include/libavformat 
-  make -j1  # not parallel safe, error find -ldlna
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make INSTALL=/bin/install DESTDIR=${pkgdir} install
-}
-md5sums=('2c974f95b711e5fd07f78fc4ebfcca66'
-         '937f1aebf930571127856056bd1d3959'
-         'a5c9f58233fc7fc79b5fe550b297273b')
diff --git a/community-testing/libdlna/ffmpeg-0.8.patch b/community-testing/libdlna/ffmpeg-0.8.patch
deleted file mode 100644
index 63b33a451..000000000
--- a/community-testing/libdlna/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -aur libdlna-0.2.3/src/profiles.c libdlna-0.2.3.new/src/profiles.c
---- libdlna-0.2.3/src/profiles.c	2007-11-26 21:47:43.000000000 +0100
-+++ libdlna-0.2.3.new/src/profiles.c	2011-10-31 16:06:34.000000000 +0100
-@@ -205,13 +205,13 @@
-   for (i = 0; i < ctx->nb_streams; i++)
-   {
-     if (audio_stream == -1 &&
--        ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+        ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-     {
-       audio_stream = i;
-       continue;
-     }
-     else if (video_stream == -1 &&
--             ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
-+             ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-     {
-       video_stream = i;
-       continue;
diff --git a/community-testing/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/community-testing/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
deleted file mode 100644
index 8620ab2eb..000000000
--- a/community-testing/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=297872
-http://hg.geexbox.org/libdlna/raw-rev/4113a728a2ca
-
-From 81130b9ade274bfc53900999ccc6f963ae9ce9d7 Mon Sep 17 00:00:00 2001
-From: Jeremy Olexa <darkside@gentoo.org>
-Date: Tue, 22 Dec 2009 00:22:42 -0600
-Subject: [PATCH] Update reference to ffmpeg header files
-
----
- configure             |    4 ++--
- src/av_mpeg4_part10.c |    2 +-
- src/av_mpeg4_part2.c  |    2 +-
- src/containers.c      |    2 +-
- src/profiles.h        |    4 ++--
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure b/configure
-index 8acbd9d..85c1091 100755
---- a/configure
-+++ b/configure
-@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then
- fi
- 
- echolog "Checking for libavformat ..."
--check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
-+check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
- echolog "Checking for libavcodec ..."
--check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
-+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
- 
- #################################################
- #   version
-diff --git a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c
-index bd17022..f9c8ee5 100644
---- a/src/av_mpeg4_part10.c
-+++ b/src/av_mpeg4_part10.c
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- 
- #include "dlna_internals.h"
- #include "profiles.h"
-diff --git a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c
-index 0148384..823e1b6 100644
---- a/src/av_mpeg4_part2.c
-+++ b/src/av_mpeg4_part2.c
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- 
- #include "dlna_internals.h"
- #include "profiles.h"
-diff --git a/src/containers.c b/src/containers.c
-index 71b51f7..ca0819b 100644
---- a/src/containers.c
-+++ b/src/containers.c
-@@ -4,7 +4,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- 
- #include "containers.h"
- #include "profiles.h"
-diff --git a/src/profiles.h b/src/profiles.h
-index 7b86d33..a7fc0fd 100644
---- a/src/profiles.h
-+++ b/src/profiles.h
-@@ -22,8 +22,8 @@
- #ifndef _PROFILES_H_
- #define _PROFILES_H_
- 
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- 
- #include "dlna_internals.h"
- #include "containers.h"
--- 
-1.6.4.4
-
diff --git a/community-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD
deleted file mode 100644
index cff8dd04a..000000000
--- a/community-testing/lightspark/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=lightspark
-pkgver=0.5.2.1
-pkgrel=2
-pkgdesc='An alternative Flash Player for Linux.'
-arch=('i686' 'x86_64')
-url='http://lightspark.sourceforge.net'
-license=('LGPL3')
-conflicts=('lightspark-git')
-depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2')
-makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig')
-optdepends=('gnash-gtk: fallback support')
-install="lightspark.install"
-source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz"
-        'llvm29.diff')
-md5sums=('ac2233a83e8bf0b305563bbce322cd76'
-         '5f717d1d9ead478184ca68f6ac068099')
-
-build() {
-  cd lightspark-${pkgver}
-  patch -Np0 -i ${srcdir}/llvm29.diff
-  cd ${srcdir}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCOMPILE_PLUGIN=1 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \
-    ../lightspark-${pkgver}
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/lightspark/lightspark.install b/community-testing/lightspark/lightspark.install
deleted file mode 100644
index 75e2b7b55..000000000
--- a/community-testing/lightspark/lightspark.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 $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/lightspark/llvm29.diff b/community-testing/lightspark/llvm29.diff
deleted file mode 100644
index f859852af..000000000
--- a/community-testing/lightspark/llvm29.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.old	2011-11-01 22:07:52.475608726 +0000
-+++ CMakeLists.txt	2011-11-01 22:08:52.046241925 +0000
-@@ -152,7 +152,8 @@
- 	MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!")
- ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8)
- IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
--	MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!")
-+	#MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!")
-+	ADD_DEFINITIONS(-DLLVM_29)
- ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9)
- IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8)
- 	ADD_DEFINITIONS(-DLLVM_28)
diff --git a/community-testing/minidlna/PKGBUILD b/community-testing/minidlna/PKGBUILD
deleted file mode 100644
index 612cc92c2..000000000
--- a/community-testing/minidlna/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 58002 2011-11-05 11:39:33Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:Biginoz < biginoz AT free point fr>
-# Contributor: Ignacio Galmarino <igalmarino@gmail.com>
-# Contributor: Matthias Sobczyk <matthias.sobczyk@googlemail.com>
-
-pkgname=minidlna
-pkgver=1.0.22
-pkgrel=4
-pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/minidlna/"
-license=('GPL')
-depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite3')
-conflicts=('minidlna-cvs')
-backup=('etc/minidlna.conf'
-	'etc/conf.d/minidlna')
-changelog=changelog
-source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
-        minidlna.rc)
-md5sums=('3de2f6b54f43bb998dfad3c8fa75cef3'
-         '8b064a6c344a3ad8029e2619dfe07b77')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  DESTDIR=$pkgdir make install
-  install -D -m755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna
-  mkdir -p $pkgdir/etc/conf.d
-  echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna
-}
diff --git a/community-testing/minidlna/changelog b/community-testing/minidlna/changelog
deleted file mode 100644
index 35bf6239c..000000000
--- a/community-testing/minidlna/changelog
+++ /dev/null
@@ -1,4 +0,0 @@
-2011-08-29 Sergej Pupykin <sergej@p5n.pp.ru>
-
-	* 1.0.22-3 :
-	add user configuration to /etc/conf.d/minidlna
diff --git a/community-testing/minidlna/minidlna.rc b/community-testing/minidlna/minidlna.rc
deleted file mode 100755
index df44a549f..000000000
--- a/community-testing/minidlna/minidlna.rc
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/minidlna.conf
-. /etc/conf.d/minidlna
-
-PID=`pidof -o %PPID /usr/sbin/minidlna`
-
-case "$1" in
-  start)
-    stat_busy "Starting minidlna"
-    [ -z "$PID" ] && su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon minidlna
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping minidlna"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon minidlna
-      stat_done
-    fi
-    ;;
-  clean)
-	$0 stop
-	sleep 1
-	stat_busy "Cleaning minidlna cache"
-	[ -z $db_dir ] || rm -r $db_dir/*
-	stat_done
-	sleep 1
-	$0 start
-	;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|clean}"
-esac
-exit 0
diff --git a/community-testing/mlt/PKGBUILD b/community-testing/mlt/PKGBUILD
deleted file mode 100644
index 7bc6df243..000000000
--- a/community-testing/mlt/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 58004 2011-11-05 11:39:48Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
-# Contributor: funkyou <spamopfer@nickname.berlin.de>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgbase=mlt
-pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.7.6
-pkgrel=1
-pkgdesc="An open source multimedia framework"
-arch=('i686' 'x86_64')
-url="http://www.mltframework.org"
-license=('GPL')
-makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
-	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('105969a63339da2f8ce4ddce1652c9e7')
-
-build() {
-  # mlt
-  cd $srcdir/mlt-$pkgver
-
-#  [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
-  SSE2=--disable-sse2
-
-  msg "SSE2=$SSE2"
-  ./configure --prefix=/usr --enable-gpl \
-	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \
-	--avformat-vdpau \
-	--avformat-swscale $SSE2
-  make
-
-  # mlt python bindings
-  cd $srcdir/mlt-$pkgver/src/swig/python
-  sed -i 's_path=`which python_path=`which python2_' build
-  sed -i 's_`python -c_`python2 -c_' build
-  sed -i 's#python-config#python2-config#' build
-  ./build
-}
-
-package_mlt() {
-  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
-  optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa")
-  conflicts=('mlt++<=0.3.8')
-
-  cd $srcdir/mlt-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-package_mlt-python-bindings() {
-  depends=('python2' 'mlt')
-
-  cd $srcdir/mlt-$pkgver/src/swig/python
-  mkdir -p $pkgdir/usr/lib/python2.7/
-  install -m755 mlt.py $pkgdir/usr/lib/python2.7/
-  install -m755 _mlt.so $pkgdir/usr/lib/python2.7/
-  install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/
-}
diff --git a/community-testing/motion/PKGBUILD b/community-testing/motion/PKGBUILD
deleted file mode 100644
index 320fab35f..000000000
--- a/community-testing/motion/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 58006 2011-11-05 11:40:00Z ibiru $
-# Maintainer:
-
-pkgname=motion
-pkgver=3.2.12
-pkgrel=2
-pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-depends=('ffmpeg' 'libjpeg' 'v4l-utils')
-backup=('etc/motion/motion.conf')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion ffmpeg-0.8.patch linux-headers.patch)
-md5sums=('1ba0065ed50509aaffb171594c689f46' '24b6fbfa586857b72f90cda81410c14f')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' '06f74131a9d4abc8aa05f531bd19c51a5732023f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-  patch -Np1 -i $srcdir/linux-headers.patch
-  ./configure --prefix=/usr \
-    --without-pgsql \
-    --without-mysql \
-    --sysconfdir=/etc/motion
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf"
-
-  install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
-}
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         '2f422c268337dce583b9dac344005e93')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '7b41c8c273980c147694d82af7c9cb9e51302dd9')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         '5db295d7c2e4c38f36e861a3c4dfdd8d')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '2b12df6d9053d17f6ac1969e3510dd50c6fe6667')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         'd36687710837d69fbce4608b1345fa34')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '6912448db0711f85322505ee6f8052f8f98ae634')
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '24b6fbfa586857b72f90cda81410c14f'
-         'd36687710837d69fbce4608b1345fa34'
-         'd8c3c4fdded5cfbd729710475559a21d')
-sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd'
-          '06f74131a9d4abc8aa05f531bd19c51a5732023f'
-          '6912448db0711f85322505ee6f8052f8f98ae634'
-          '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e')
diff --git a/community-testing/motion/ffmpeg-0.8.patch b/community-testing/motion/ffmpeg-0.8.patch
deleted file mode 100644
index 5dcc6e686..000000000
--- a/community-testing/motion/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c
---- motion-3.2.12/ffmpeg.c	2010-06-01 08:48:23.000000000 +0200
-+++ motion-3.2.12.new/ffmpeg.c	2011-10-31 17:25:03.000000000 +0100
-@@ -14,7 +14,7 @@
- 
- #include "ffmpeg.h"
- #include "motion.h"
--
-+#include <libavformat/avformat.h>
- #if LIBAVCODEC_BUILD > 4680
- /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with 
-  * non-standard framerates. Previous builds contained a broken hack 
-@@ -228,10 +228,12 @@
-     mpeg1_file_protocol.url_close = file_protocol.url_close;
- 
-     /* Register the append file protocol. */
--#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8)
--    av_register_protocol(&mpeg1_file_protocol);
-+#ifdef have_av_register_protocol2
-+        av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol));
-+#elif defined have_av_register_protocol        
-+	    av_register_protocol(&mpeg1_file_protocol);
- #else
--    register_protocol(&mpeg1_file_protocol);
-+#   warning av_register_protocolXXX missing
- #endif
- }
- 
-@@ -244,7 +246,7 @@
-     const char *ext;
-     AVOutputFormat *of = NULL;
- 
--    /* Here, we use guess_format to automatically setup the codec information.
-+    /* Here, we use av_guess_format to automatically setup the codec information.
-      * If we are using msmpeg4, manually set that codec here.
-      * We also dynamically add the file extension to the filename here. This was
-      * done to support both mpeg1 and mpeg4 codecs since they have different extensions.
-@@ -258,7 +260,7 @@
-         /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would
-          * result in a muxed output file, which isn't appropriate here.
-          */
--        of = guess_format("mpeg1video", NULL, NULL);
-+        of = av_guess_format("mpeg1video", NULL, NULL);
-         if (of) {
-             /* But we want the trailer to be correctly written. */
-             of->write_trailer = mpeg1_write_trailer;
-@@ -270,24 +272,24 @@
- #endif
-     } else if (strcmp(codec, "mpeg4") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-     } else if (strcmp(codec, "msmpeg4") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-         if (of) {
-             /* Manually override the codec id. */
-             of->video_codec = CODEC_ID_MSMPEG4V2;
-         }
-     } else if (strcmp(codec, "swf") == 0) {
-         ext = ".swf";
--        of = guess_format("swf", NULL, NULL);
-+        of = av_guess_format("swf", NULL, NULL);
-     } else if (strcmp(codec, "flv") == 0) {
-         ext = ".flv";
--        of = guess_format("flv", NULL, NULL);
-+        of = av_guess_format("flv", NULL, NULL);
-         of->video_codec = CODEC_ID_FLV1;
-     } else if (strcmp(codec, "ffv1") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-         if (of) {
-             /* Use the FFMPEG Lossless Video codec (experimental!).
-                Requires strict_std_compliance to be <= -2 */
-@@ -295,7 +297,7 @@
-         }
-     } else if (strcmp(codec, "mov") == 0) {
-         ext = ".mov";
--        of = guess_format("mov", NULL, NULL);        
-+        of = av_guess_format("mov", NULL, NULL);        
-     } else {
-         motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec);
-         return NULL;
-@@ -377,7 +379,7 @@
- 
-     ffmpeg->c     = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st);
-     c->codec_id   = ffmpeg->oc->oformat->video_codec;
--    c->codec_type = CODEC_TYPE_VIDEO;
-+    c->codec_type = AVMEDIA_TYPE_VIDEO;
-     is_mpeg1      = c->codec_id == CODEC_ID_MPEG1VIDEO;
- 
-     if (strcmp(ffmpeg_video_codec, "ffv1") == 0)
-@@ -646,7 +648,7 @@
-     if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) {
-         /* raw video case. The API will change slightly in the near future for that */
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
--        pkt.flags |= PKT_FLAG_KEY;
-+        pkt.flags |= AV_PKT_FLAG_KEY;
-         pkt.data = (uint8_t *)pic;
-         pkt.size = sizeof(AVPicture);
-         ret = av_write_frame(ffmpeg->oc, &pkt);
-@@ -667,7 +669,7 @@
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
-             pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts;
-             if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) {
--                pkt.flags |= PKT_FLAG_KEY;
-+                pkt.flags |= AV_PKT_FLAG_KEY;
-             }
-             pkt.data = ffmpeg->video_outbuf;
-             pkt.size = out_size;
diff --git a/community-testing/motion/linux-headers.patch b/community-testing/motion/linux-headers.patch
deleted file mode 100644
index 795c8aec5..000000000
--- a/community-testing/motion/linux-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h
---- motion-3.2.12-OLD/motion.h	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/motion.h	2011-08-30 02:11:08.000000000 -0700
-@@ -40,7 +40,7 @@
- 
- #define _LINUX_TIME_H 1
- #if !defined(WITHOUT_V4L) && !defined(BSD)
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #endif
- 
- #include <pthread.h>
-diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c
---- motion-3.2.12-OLD/track.c	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/track.c	2011-08-30 23:05:09.000000000 -0700
-@@ -11,6 +11,7 @@
- #include "motion.h"
- 
- #ifndef WITHOUT_V4L
-+#include <linux/videodev2.h>
- #include "pwc-ioctl.h"
- #endif
- 
-diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h
---- motion-3.2.12-OLD/video.h	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/video.h	2011-08-30 02:11:12.000000000 -0700
-@@ -12,7 +12,7 @@
- 
- #define _LINUX_TIME_H 1
- #ifndef WITHOUT_V4L
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <sys/mman.h>
- #include "pwc-ioctl.h"
- #endif
diff --git a/community-testing/motion/rc.motion b/community-testing/motion/rc.motion
deleted file mode 100755
index 6ae95d17b..000000000
--- a/community-testing/motion/rc.motion
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/motion`
-case "$1" in
-  start)
-    stat_busy "Starting Motion"
-    [ -z "$PID" ] && /usr/bin/motion
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon motion
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Motion"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon motion
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/mplayer2/PKGBUILD b/community-testing/mplayer2/PKGBUILD
deleted file mode 100644
index 62a237a2e..000000000
--- a/community-testing/mplayer2/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 58008 2011-11-05 11:40:07Z ibiru $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Bartek Piotrowski <barthalion@gmail.com>
-
-pkgname=mplayer2
-pkgver=2.0.20111101
-pkgrel=1
-pkgdesc="A movie player"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.mplayer2.org/"
-depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2'
-         'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad'
-         'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa')
-makedepends=('live-media' 'mesa' 'unzip' 'yasm' 'git')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-provides=('mplayer')
-conflicts=('mplayer')
-#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d')
-options=('!emptydirs')
-
-# source PKGBUILD && mksource
-mksource() {
-  _gitroot="git://git.mplayer2.org/mplayer2.git"
-  _gitname="${pkgname}-${pkgver}"
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  tar -cJvf ${_gitname}.tar.xz ${_gitname}
-  rm -fr ${_gitname}
-}
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr \
-                --enable-runtime-cpudetection \
-                --disable-arts \
-                --disable-speex \
-                --disable-openal \
-                --disable-libdv \
-                --disable-musepack \
-                --disable-esd \
-                --disable-mga \
-                --language=all \
-                --enable-translation \
-                --confdir=/etc/mplayer
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/
-    install -dm755 "${pkgdir}"/usr/share/mplayer/
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf
-
-    install -dm755 "${pkgdir}"/usr/share/applications/
-    install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/
-}
diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD
deleted file mode 100644
index bd765ef2a..000000000
--- a/community-testing/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 58010 2011-11-05 11:40:11Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hans Janssen <janserv@gmail.com>
-# Contributor: my64 <packages@obordes.com>
-# Contributor: Colin Pitrat <colin.pitrat@gmail.com>
-
-pkgname=openscenegraph
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="An Open Source, high performance real-time graphics toolkit"
-arch=('i686' 'x86_64')
-license=('custom:OSGPL')
-url="http://www.openscenegraph.org"
-depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
-conflicts=('openthreads')
-provides=('openthreads')
-source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip)
-#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
-md5sums=('c43a25d023e635c3566b2083d8e6d956')
-
-build() {
-  cd OpenSceneGraph-$pkgver
-  [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
-  make
-}
-
-package() {
-  cd OpenSceneGraph-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
-}
diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD
deleted file mode 100644
index 6b5b115ed..000000000
--- a/community-testing/performous/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 58012 2011-11-05 11:40:18Z ibiru $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=performous
-pkgver=0.6.1
-pkgrel=10
-pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
-arch=('i686' 'x86_64')
-url="http://performous.org/"
-license=('GPL')
-depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \
-         'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo')
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47')
-optdepends=('performous-freesongs: free songs for performous')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
-        boost-filesystem-v3.patch
-        ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a")
-md5sums=('451a759de77984b5a699e91107fe52e2'
-         '42a8c825d80b0de16bd5752d2a80e585'
-         'ff0ffa681dfaa09c4f42133a65309bf0')
-
-build() {
-  cd ${srcdir}/Performous-${pkgver}-Source
-
-  # fix to built against boost 1.46 and later, upstream (git) now support v3
-  patch -Np1 -i ../boost-filesystem-v3.patch
-  # fix with ffmpeg-0.8
-  patch -Np1 -i ../ffmpeg-0.8.patch
-
-  mkdir -p build
-  cd build
-
-  # fix config loading with libxml++
-  export LDFLAGS=${LDFLAGS/-Wl,--as-needed/}
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Performous-${pkgver}-Source/build
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/performous/boost-filesystem-v3.patch b/community-testing/performous/boost-filesystem-v3.patch
deleted file mode 100644
index 22dd07213..000000000
--- a/community-testing/performous/boost-filesystem-v3.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/game/backgrounds.cc b/game/backgrounds.cc
-index 7fd3cd0..cdedefb 100644
---- a/game/backgrounds.cc
-+++ b/game/backgrounds.cc
-@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) {
- 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
- 			fs::path p = dirIt->path();
- 			if (fs::is_directory(p)) { reload_internal(p); continue; }
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename
- 			std::string path = p.directory_string(); // Path without filename
-+#else
-+			std::string name = p.filename().string(); // File basename
-+			std::string path = p.string(); // Path without filename
-+#endif
- 			path.erase(path.size() - name.size());
- 			if (!regex_match(name.c_str(), match, expression)) continue;
- 			{
-diff --git a/game/cache.cc b/game/cache.cc
-index 69974e2..0f1edd0 100644
---- a/game/cache.cc
-+++ b/game/cache.cc
-@@ -9,7 +9,11 @@ namespace cache {
- 	fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){
- 		fs::path cache_filename;
- 		std::string const lod = (boost::format("%.2f") % factor).str();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png";
-+#else
-+		std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png";
-+#endif
- 
- 		if (isThemeResource(svgfilename)) {
- 			std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s());
-diff --git a/game/filemagic.hh b/game/filemagic.hh
-index bf87ded..29e81fe 100644
---- a/game/filemagic.hh
-+++ b/game/filemagic.hh
-@@ -71,7 +71,11 @@ namespace filemagic {
- 		// For now, just check the extension an assume it's not lying.
- 
- 		// Get file extension in lower case
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string ext = filename.extension();
-+#else
-+		std::string ext = filename.extension().string();
-+#endif
- 		// somehow this does not convert the extension to lower case:
- 		//std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower));
- 		std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower );
-diff --git a/game/fs.cc b/game/fs.cc
-index e34a784..767a7ab 100644
---- a/game/fs.cc
-+++ b/game/fs.cc
-@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) {
- 
- bool isThemeResource(fs::path filename){
- 	try {
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string themefile = getThemePath(filename.filename());
-+#else
-+		std::string themefile = getThemePath(filename.filename().string());
-+#endif
- 		return themefile == filename;
- 	} catch (...) { return false; }
- }
-diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
-index 38e163b..db15d79 100644
---- a/game/songparser-ini.cc
-+++ b/game/songparser-ini.cc
-@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() {
- 	// Search the dir for the music files
- 	for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
- 		boost::filesystem::path p = dirIt->path();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string name = p.leaf(); // File basename (notes.txt)
-+#else
-+		std::string name = p.filename().string(); // File basename (notes.txt)
-+#endif
- 		if (regex_match(name.c_str(), match, midifile)) {
- 			 s.midifilename = name;
- 		} else if (regex_match(name.c_str(), match, audiofile_background)) {
-diff --git a/game/songparser.cc b/game/songparser.cc
-index 2b7b9b4..ac9f3f6 100644
---- a/game/songparser.cc
-+++ b/game/songparser.cc
-@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s):
- 
- 		for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
- 			boost::filesystem::path p = dirIt->path();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename
-+#else
-+			std::string name = p.filename().string(); // File basename
-+#endif
- 			if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) {
- 				m_song.cover = name;
- 			} else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) {
-diff --git a/game/songs.cc b/game/songs.cc
-index 62ab26d..afab383 100644
---- a/game/songs.cc
-+++ b/game/songs.cc
-@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) {
- 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
- 			fs::path p = dirIt->path();
- 			if (fs::is_directory(p)) { reload_internal(p); continue; }
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename (notes.txt)
- 			std::string path = p.directory_string(); // Path without filename
-+#else
-+			std::string name = p.filename().string(); // File basename (notes.txt)
-+			std::string path = p.string(); // Path without filename
-+#endif
- 			path.erase(path.size() - name.size());
- 			if (!regex_match(name.c_str(), match, expression)) continue;
- 			try {
-diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh
-index 58e19dc..8895d94 100644
---- a/tools/ss_helpers.hh
-+++ b/tools/ss_helpers.hh
-@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st
- void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); }
- void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); }
- 
-+#if BOOST_FILESYSTEM_VERSION < 3
- std::string filename(boost::filesystem::path const& p) { return *--p.end(); }
-+#else
-+std::string filename(boost::filesystem::path const& p) { return p.filename().string(); }
-+#endif
- 
- /** Fix Singstar's b0rked XML **/
- std::string xmlFix(std::vector<char> const& data) {
--- 
-1.7.4.1
-
diff --git a/community-testing/picard/PKGBUILD b/community-testing/picard/PKGBUILD
deleted file mode 100644
index a739d9c2e..000000000
--- a/community-testing/picard/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 58014 2011-11-05 11:40:31Z ibiru $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: sysrq
-
-pkgname=picard
-pkgver=0.16
-pkgrel=2
-pkgdesc='Official MusicBrainz tagger'
-url='http://musicbrainz.org/doc/MusicBrainz_Picard'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg')
-optdepends=('libdiscid: CD-Lookup feature')
-source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('274071410550ee29051bb0137d72602921a015f9')
-
-install=install
-
-build() {
-	cd "${srcdir}/picard-${pkgver}"
-	python2 setup.py config
-}
-
-package() {
-	cd "${srcdir}/picard-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/community-testing/picard/install b/community-testing/picard/install
deleted file mode 100644
index b46fab005..000000000
--- a/community-testing/picard/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-	update-desktop-database -q &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-testing/qmmp/PKGBUILD b/community-testing/qmmp/PKGBUILD
deleted file mode 100644
index c34f9af48..000000000
--- a/community-testing/qmmp/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-#$Id: PKGBUILD 58016 2011-11-05 11:40:48Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=qmmp
-pkgver=0.5.2
-pkgrel=2
-pkgdesc="Qt4 based audio-player"
-arch=('i686' 'x86_64')
-url="http://qmmp.ylsoftware.com/"
-license=('GPL')
-depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt' 'taglib' 'xdg-utils')
-makedepends=('cmake'  'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack')
-optdepends=('flac: native FLAC support'
-            'jack: JACK sound output'
-            'libmpcdec: Musepack support'
-            'pulseaudio: PulseAudio output'
-            'libcdio: Compact Disc input and control support'
-            'libcddb: CDDB server support'
-            'libmms: MMS stream protocol support'
-            'libmodplug: MOD playing library'
-            'libsndfile: sampled sound support'
-            'ffmpeg' 'libsamplerate' 'wavpack')
-install=$pkgname.install
-source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/qmmp/qmmp.changelog b/community-testing/qmmp/qmmp.changelog
deleted file mode 100644
index 31050d69e..000000000
--- a/community-testing/qmmp/qmmp.changelog
+++ /dev/null
@@ -1,47 +0,0 @@
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.2-1
-
-2011-07-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.1-1
-
-2011-04-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.0-1
-
-2011-02-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.4.4-1
-
-2010-11-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.3
-
-2010-09-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.2
-
-2010-06-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.1
-
-2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.0
-
-2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.4
-
-2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.3
-
-2010-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.2
-
-2009-07-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.0
-
-2009-03-30 Giovanni Scafora <giovanni@archlinux.org>
-	* Fixed x86_64 build
-
-2009-03-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.4
-
-2008-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.3
-
-2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.2
diff --git a/community-testing/qmmp/qmmp.install b/community-testing/qmmp/qmmp.install
deleted file mode 100644
index 4c0972beb..000000000
--- a/community-testing/qmmp/qmmp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/shotwell/fix-with-libraw-0.4.patch b/community-testing/shotwell/fix-with-libraw-0.4.patch
deleted file mode 100644
index f6f021b61..000000000
--- a/community-testing/shotwell/fix-with-libraw-0.4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled
-diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala
---- shotwell-0.11.5/src/photos/GRaw.vala	2011-09-24 00:52:27.000000000 +0200
-+++ shotwell-0.11.5-fixed/src/photos/GRaw.vala	2011-11-01 00:25:05.976289495 +0100
-@@ -163,9 +163,9 @@
-         proc = new LibRaw.Processor(options);
-     }
-     
--    public void add_masked_borders_to_bitmap() {
--        proc.add_masked_borders_to_bitmap();
--    }
-+//    public void add_masked_borders_to_bitmap() {
-+//        proc.add_masked_borders_to_bitmap();
-+//    }
-     
-     public void adjust_sizes_info_only() throws Exception {
-         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
-@@ -215,9 +215,9 @@
-         throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
-     }
-     
--    public void rotate_fuji_raw() throws Exception {
--        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
--    }
-+//    public void rotate_fuji_raw() throws Exception {
-+//        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
-+//    }
-     
-     public void thumb_writer(string filename) throws Exception {
-         throw_exception("thumb_writer", proc.thumb_writer(filename));
-@@ -262,7 +262,7 @@
-         // camera_profile
-         // bad_pixels
-         // dark_frame
--        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
-+        // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
-         output_params->output_bps = 8;
-         // output_tiff
-         output_params->user_flip = GRaw.Flip.FROM_SOURCE;
-@@ -303,8 +303,8 @@
-         case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
-             throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
-         
--        case LibRaw.Result.CANNOT_ADDMASK:
--            throw new Exception.CANNOT_ADDMASK(msg);
-+//        case LibRaw.Result.CANNOT_ADDMASK:
-+//            throw new Exception.CANNOT_ADDMASK(msg);
-         
-         case LibRaw.Result.UNSUFFICIENT_MEMORY:
-             throw new Exception.OUT_OF_MEMORY(msg);
diff --git a/community-testing/synfig/PKGBUILD b/community-testing/synfig/PKGBUILD
deleted file mode 100644
index 2c324912d..000000000
--- a/community-testing/synfig/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 58018 2011-11-05 11:40:57Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Franco Iacomella <yaco@gnu.org>
-
-pkgname=synfig
-pkgver=0.63.02
-pkgrel=2
-pkgdesc="Professional vector animation program (CLI renderer only)"
-arch=(i686 x86_64)
-url="http://synfig.org"
-license=('GPL2')
-depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng'
-	 'libtiff' 'libdv' 'libmng')
-optdepends=('openexr' 'libsigc++')
-conflicts=('synfig-core')
-replaces=('synfig-core')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz
-	build-fix.patch ffmpeg-0.8.patch)
-md5sums=('4286d5e1887275107d760d1b678aec24'
-         '2de5e74159a38e4b1788c20d4c4b6f68')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
-  [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
-  patch -p1 -i $srcdir/build-fix.patch
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-md5sums=('4286d5e1887275107d760d1b678aec24'
-         '2de5e74159a38e4b1788c20d4c4b6f68'
-         'f1f22b1ce2c13e25d5eb51a664a9551f')
-md5sums=('4286d5e1887275107d760d1b678aec24'
-         '2de5e74159a38e4b1788c20d4c4b6f68'
-         'ebf41046097cfd778dee9a9854561dae')
diff --git a/community-testing/synfig/build-fix.patch b/community-testing/synfig/build-fix.patch
deleted file mode 100644
index 9124a517a..000000000
--- a/community-testing/synfig/build-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp	2011-06-05 13:04:07.000000000 +0400
-+++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp	2011-06-14 14:32:49.000000000 +0400
-@@ -31,6 +31,10 @@
- #	include <config.h>
- #endif
- 
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
-+
- #include "trgt_av.h"
- 
- extern "C"
-@@ -116,14 +120,14 @@
-     picture = avcodec_alloc_frame();
-     if (!picture)
-         return NULL;
--    size = avpicture_get_size(pix_fmt, width, height);
-+    size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height);
-     picture_buf = (uint8_t *)malloc(size);
-     if (!picture_buf) {
-         av_free(picture);
-         return NULL;
-     }
-     avpicture_fill((AVPicture *)picture, picture_buf,
--                   pix_fmt, width, height);
-+                   (enum ::PixelFormat)pix_fmt, width, height);
-     return picture;
- }
- 
-diff -wbBur synfig-core/src/modules/mod_png/mptr_png.cpp synfig-core.my/src/modules/mod_png/mptr_png.cpp
---- synfig-core/src/modules/mod_png/mptr_png.cpp	2011-06-05 13:04:07.000000000 +0400
-+++ synfig-core.my/src/modules/mod_png/mptr_png.cpp	2011-06-14 14:32:49.000000000 +0400
-@@ -309,7 +309,7 @@
- 				float b=gamma().b_U8_to_F32((unsigned char)png_ptr->palette[row_pointers[y][x]].blue);
- 				float a=1.0;
- 				if(info_ptr->valid & PNG_INFO_tRNS)
--				    a = (float)(unsigned char)png_ptr->trans[row_pointers[y][x]]*(1.0/255.0);
-+				    a = (float)(unsigned char)png_ptr->trans_alpha[row_pointers[y][x]]*(1.0/255.0);
- 				surface_buffer[y][x]=Color(
- 					r,
- 					g,
diff --git a/community-testing/synfig/ffmpeg-0.8.patch b/community-testing/synfig/ffmpeg-0.8.patch
deleted file mode 100644
index 4ba40fff2..000000000
--- a/community-testing/synfig/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp	2011-09-29 10:51:41.000000000 +0200
-+++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp	2011-10-31 16:39:03.000000000 +0100
-@@ -441,7 +441,7 @@
- 		if( context->coded_frame )
- 			pkt.pts = context->coded_frame->pts;
- 		if( context->coded_frame && context->coded_frame->key_frame)
--			pkt.flags |= PKT_FLAG_KEY;
-+			pkt.flags |= AV_PKT_FLAG_KEY;
- 
- 		//kluge for raw picture format (they said they'd fix)
- 		if (formatc->oformat->flags & AVFMT_RAWPICTURE)
-@@ -463,7 +463,7 @@
- 				if( context->coded_frame )
- 					pkt.pts = context->coded_frame->pts;
- 				if( context->coded_frame && context->coded_frame->key_frame)
--					pkt.flags |= PKT_FLAG_KEY;
-+					pkt.flags |= AV_PKT_FLAG_KEY;
- 
- 				ret = av_write_frame(formatc, &pkt);
- 
-@@ -567,17 +567,17 @@
- 		if (typestring)
- 		{
- 			//formatptr guess_format(type, filename, MIME type)
--			format = guess_format(typestring,NULL,NULL);
-+			format = av_guess_format(typestring,NULL,NULL);
- 		}
- 		else
- 		{
--			format = guess_format(NULL, filename, NULL);
-+			format = av_guess_format(NULL, filename, NULL);
- 		}
- 
- 		if(!format)
- 		{
- 			synfig::warning("Unable to Guess the output, defaulting to mpeg");
--			format = guess_format("mpeg", NULL, NULL);
-+			format = av_guess_format("mpeg", NULL, NULL);
- 		}
- 
- 		if(!format)
-@@ -753,7 +753,7 @@
- 
- 		context = st->codec;
- 		context->codec_id = (CodecID)codec_id;
--		context->codec_type = CODEC_TYPE_VIDEO;
-+		context->codec_type = AVMEDIA_TYPE_VIDEO;
- 
- 		//PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???)
- 
-@@ -800,7 +800,7 @@
- 
- 		context = stream->codec;
- 		context->codec_id = (CodecID)codec_id;
--		context->codec_type = CODEC_TYPE_AUDIO;
-+		context->codec_type = AVMEDIA_TYPE_AUDIO;
- 
- 		/* put sample parameters */
- 		context->bit_rate = 64000;
diff --git a/community-testing/vtk/ffmpeg-0.8.diff b/community-testing/vtk/ffmpeg-0.8.diff
deleted file mode 100644
index 523919d6f..000000000
--- a/community-testing/vtk/ffmpeg-0.8.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 5.6.1-6.1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- vtk (5.6.1-6.1) unstable; urgency=low
- .
-   [ Michael Schutte ]
-   * Non-maintainer upload.
-   * Remove absolute paths to required libraries from
-     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
-     #506992.  Due to the multiarch transition, the original behavior
-     frequently causes reverse build-deps to FTBFS.  This change should
-     probably be reverted once all required libraries are multiarched.
- .
-   [ Steve M. Robbins ]
-   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
-   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
-     0.7.
- .
- The person named in the Author field signed this changelog entry.
-Author: Steve M. Robbins <smr@debian.org>
-Bug-Debian: http://bugs.debian.org/506992
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
-+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
-     }
- 
-   //choose avi media file format
--  this->avOutputFormat = guess_format("avi", NULL, NULL);
-+  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
-   if (!this->avOutputFormat) 
-     {
-     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
-   //Set up the codec.
-   AVCodecContext *c = this->avStream->codec;
-   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
--  c->codec_type = CODEC_TYPE_VIDEO;
-+  c->codec_type = AVMEDIA_TYPE_VIDEO;
-   c->width = this->Dim[0];
-   c->height = this->Dim[1];
-   c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
-     pkt.stream_index = this->avStream->index;
-     if (cc->coded_frame->key_frame) //treat keyframes well
-       {
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       }
-     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
-     pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/community-testing/wxsvg/PKGBUILD b/community-testing/wxsvg/PKGBUILD
deleted file mode 100644
index 5884ba741..000000000
--- a/community-testing/wxsvg/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 58022 2011-11-05 11:41:09Z ibiru $
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=wxsvg
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="C++ library to create, manipulate and render SVG files"
-arch=('i686' 'x86_64')
-url="http://wxsvg.sourceforge.net/"
-license=('custom:wxWindows')
-depends=('wxgtk' 'libart-lgpl' 'ffmpeg')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}.tar.bz2")
-md5sums=('d88b0a68334df157fa560413681c3264')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/wxsvg/COPYING"
-}
diff --git a/community-testing/xmms2/PKGBUILD b/community-testing/xmms2/PKGBUILD
deleted file mode 100644
index 15855970f..000000000
--- a/community-testing/xmms2/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 58024 2011-11-05 11:41:26Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=xmms2
-pkgver=0.8DrO_o
-pkgrel=2
-pkgdesc="complete rewrite of the popular music player"
-arch=('i686' 'x86_64')
-url="http://xmms2.org/"
-license=('LGPL')
-backup=('etc/conf.d/xmms2d.conf')
-depends=('sqlite3' 'libmad')
-makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib'
-	'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout'
-	'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex'
-	'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') # avahi
-optdepends=('alsa-lib: ALSA audio output'
-	    'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
-	    'boost: C++ language bindings'
-	    'curl: play HTTP streams'
-	    'faad2: AAC support'
-	    'ffmpeg: WMA, avcodec & avformat support'
-	    'fftw: calculations for visualization'
-	    'flac: FLAC support'
-	    'jack: JACK audio output'
-	    'libao: liboa audio output'
-	    'libofa: MusicDNS fingerprinting'
-	    'libmms: play MMS streams'
-	    'libmodplug: to play MOD files'
-	    'libmpcdec: Musepack support'
-	    'libsamplerate: vocoder support'
-	    'libshout: Icecast audio output'
-	    'libvorbis: Ogg Vorbis support'
-	    'libxml2: XSPF and podcast support'
-	    'mpg123: alternative MP3 plugin'
-	    'oss: OSS audio output'
-	    'perl: Perl language bindings'
-	    'pulseaudio: PulseAudio audio output'
-	    'pyrex: Python language bindings'
-	    'ruby: Ruby language bindings'
-	    'smbclient: direct CIFS/SMB access'
-	    'speex: Speex support'
-	    'wavpack: WavPack support')
-#	    'sidplay: to play a Commodore 64 music files AKA zaks'
-# we do not have sidplay 2 series in repos; also it's
-# somehow connected with resid i guess(not in repos also)
-conflicts=('xmms2-devel')
-install=xmms2.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	xmms2d.conf
-	xmms2d.rc
-	xmms2-helpers.patch
-	vorbis-albumart.patch)
-md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
-         'af13c937bf3c86b77ae6820107aab9b8'
-         '9d8e3e1a434f271423bdd228a1e9bd7c'
-         'eddb800ebcc495b8574044a110a34add'
-         'c5a16da0c5a6ebe5e7f58afb6edfa87e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-#  patch -Np1 < ${srcdir}/xmms2-helpers.patch
-#  patch -p1 <$srcdir/vorbis-albumart.patch
-
-  # python2 fix
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf
-
-  ./waf configure --prefix=/usr \
-	--with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli
-  ./waf build
-  ./waf --destdir=${pkgdir} install
-
-  install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d
-  install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf
-}
diff --git a/community-testing/xmms2/vorbis-albumart.patch b/community-testing/xmms2/vorbis-albumart.patch
deleted file mode 100644
index de4305f6f..000000000
--- a/community-testing/xmms2/vorbis-albumart.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From f38882beb1c9b4f3e3c63ac7d65603ad5917cd9d Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <anomie@users.sourceforge.net>
-Date: Tue, 09 Mar 2010 15:41:33 +0000
-Subject: OTHER: Add support for METADATA_BLOCK_PICTURE in Vorbis plugin
-
-Bug-Debian: http://bugs.debian.org/565479
----
-diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c
-index c1f4ef9..fc4ff1b 100644
---- a/src/plugins/vorbis_common/common.c
-+++ b/src/plugins/vorbis_common/common.c
-@@ -243,6 +243,74 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc)
- 	}
- }
- 
-+static void
-+handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+{
-+	guint32 typ, mime_len, desc_len, img_len;
-+	guchar *pos, *end, *mime_data, *img_data;
-+	gchar hash[33];
-+
-+	pos = value;
-+	end = value + len;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	typ = GUINT32_FROM_BE (*(guint32 *)pos);
-+	if (typ != 0 && typ != 3) {
-+		XMMS_DBG ("Picture type %d not handled", typ);
-+		return;
-+	}
-+	pos += 4;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	mime_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	mime_data = pos;
-+	pos += mime_len;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	desc_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	pos += desc_len;
-+
-+	pos += 4; /* width */
-+	pos += 4; /* height */
-+	pos += 4; /* depth */
-+	pos += 4; /* indexed palette length */
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	img_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	img_data = pos;
-+
-+	if (img_data + img_len > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+
-+	if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+		const gchar *metakey;
-+
-+		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-+		xmms_xform_metadata_set_str (xform, metakey, hash);
-+
-+		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
-+		mime_data[mime_len] = '\0';
-+		xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+	}
-+}
-+
- /* note that "key" is NOT NUL-terminated here,
-  * but "value" is.
-  */
-@@ -253,6 +321,14 @@ handle_comment (xmms_xform_t *xform,
- {
- 	gint i;
- 
-+	if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
-+		gsize dlen;
-+		gchar *dvalue = g_base64_decode (value, &dlen);
-+		handle_image_comment (xform, dvalue, dlen);
-+		g_free (dvalue);
-+		return;
-+	}
-+
- 	for (i = 0; i < G_N_ELEMENTS (properties); i++) {
- 		if (key_len != strlen (properties[i].vname))
- 			continue;
---
-cgit v0.8.3.4
-
-
-From d8273630bd92ecea581240ae93c6795cc538d076 Mon Sep 17 00:00:00 2001
-From: Erik Massop <e.massop@hccnet.nl>
-Date: Tue, 09 Mar 2010 15:45:03 +0000
-Subject: OTHER: Add Brad Jorsch to AUTHORS, disable Vorbis albumart for glib < 2.12
-
-(Name found using e-mail address at http://sourceforge.net/users/anomie )
----
-diff --git a/AUTHORS b/AUTHORS
-index f2ef9af..7331d4b 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -146,6 +146,10 @@ N: Johannes Jordan
- E: ypnos@lanrules.de
- D: Visualization
- 
-+N: Brad Jorsch
-+E: anomie@users.sourceforge.net
-+D: Support for front picture from Vorbis.
-+
- N: Daniel Kamiński
- E: maniel.rulez@gmail.com
- D: mlib remove command in cli, Ruby fixes.
-diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c
-index fc4ff1b..ab1dc75 100644
---- a/src/plugins/vorbis_common/common.c
-+++ b/src/plugins/vorbis_common/common.c
-@@ -27,6 +27,7 @@
- #include "xmms/xmms_sample.h"
- #include "xmms/xmms_log.h"
- #include "xmms/xmms_medialib.h"
-+#include "xmms/xmms_bindata.h"
- 
- #include <glib.h>
- 
-@@ -244,12 +245,22 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc)
- }
- 
- static void
--handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+handle_image_comment (xmms_xform_t *xform, const gchar *encoded_value)
- {
-+	gsize len;
-+	guchar *value;
-+
- 	guint32 typ, mime_len, desc_len, img_len;
- 	guchar *pos, *end, *mime_data, *img_data;
- 	gchar hash[33];
- 
-+#if GLIB_CHECK_VERSION(2,12,0)
-+	value = g_base64_decode (encoded_value, &len);
-+#else
-+	/* TODO: Implement/backport base64 decoding */
-+	return;
-+#endif
-+
- 	pos = value;
- 	end = value + len;
- 
-@@ -299,7 +310,7 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
- 		return;
- 	}
- 
--	if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+	if (xmms_bindata_plugin_add (img_data, img_len, hash)) {
- 		const gchar *metakey;
- 
- 		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-@@ -307,8 +318,10 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
- 
- 		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
- 		mime_data[mime_len] = '\0';
--		xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+		xmms_xform_metadata_set_str (xform, metakey, (gchar *)mime_data);
- 	}
-+
-+	g_free (value);
- }
- 
- /* note that "key" is NOT NUL-terminated here,
-@@ -322,10 +335,7 @@ handle_comment (xmms_xform_t *xform,
- 	gint i;
- 
- 	if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
--		gsize dlen;
--		gchar *dvalue = g_base64_decode (value, &dlen);
--		handle_image_comment (xform, dvalue, dlen);
--		g_free (dvalue);
-+		handle_image_comment (xform, value);
- 		return;
- 	}
- 
---
-cgit v0.8.3.4
-
-
diff --git a/community-testing/xmms2/xmms2-helpers.patch b/community-testing/xmms2/xmms2-helpers.patch
deleted file mode 100644
index f6e6aa49e..000000000
--- a/community-testing/xmms2/xmms2-helpers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -wbBur xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h	2008-06-15 21:31:38.000000000 +0400
-+++ xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h	2008-06-18 14:22:24.000000000 +0400
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
- 
-
diff --git a/community-testing/xmms2/xmms2-ruby-1.9.patch b/community-testing/xmms2/xmms2-ruby-1.9.patch
deleted file mode 100644
index 6316ace61..000000000
--- a/community-testing/xmms2/xmms2-ruby-1.9.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c	2009-09-14 09:13:19.000000000 +0000
-@@ -241,10 +241,10 @@
- 	COLL_METHOD_HANDLER_HEADER
- 
- 	rb_ary = RARRAY (ids);
--	ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1));
-+	ary = malloc (sizeof (unsigned int *) * (RARRAYLEN(rb_ary) + 1));
- 
--	for (i = 0; i < rb_ary->len; i++)
--		ary[i] = NUM2UINT (rb_ary->ptr[i]);
-+	for (i = 0; i < RARRAYLEN(rb_ary); i++)
-+		ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]);
- 
- 	ary[i] = 0;
- 
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c	2009-09-14 09:14:51.000000000 +0000
-@@ -1421,10 +1421,10 @@
- 	if (!NIL_P (rb_check_array_type (value))) {
- 		struct RArray *ary = RARRAY (value);
- 
--		ret = malloc (sizeof (char *) * (ary->len + 1));
-+		ret = malloc (sizeof (char *) * (RARRAYLEN(ary) + 1));
- 
--		for (i = 0; i < ary->len; i++)
--			ret[i] = StringValuePtr (ary->ptr[i]);
-+		for (i = 0; i < RARRAYLEN(ary); i++)
-+			ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]);
- 
- 		ret[i] = NULL;
- 	} else {
-@@ -1451,10 +1451,10 @@
- 		struct RArray *ary = RARRAY (value);
- 		int i;
- 
--		for (i = 0; i < ary->len; i++) {
-+		for (i = 0; i < RARRAYLEN(ary); i++) {
- 			xmmsv_t *elem;
- 
--			elem = xmmsv_new_string (StringValuePtr (ary->ptr[i]));
-+			elem = xmmsv_new_string (StringValuePtr (RARRAY_PTR(ary)[i]));
- 			xmmsv_list_append (list, elem);
- 			xmmsv_unref (elem);
- 		}
-diff -wbBur xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h	2009-09-14 09:00:11.000000000 +0000
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
- 
diff --git a/community-testing/xmms2/xmms2.install b/community-testing/xmms2/xmms2.install
deleted file mode 100644
index 2205a3492..000000000
--- a/community-testing/xmms2/xmms2.install
+++ /dev/null
@@ -1,3 +0,0 @@
-pre_install() {
-  echo "-- DO NOT FORGET edit /etc/conf.d/xmms2.conf!"
-}
diff --git a/community-testing/xmms2/xmms2d.conf b/community-testing/xmms2/xmms2d.conf
deleted file mode 100644
index c8304fe1d..000000000
--- a/community-testing/xmms2/xmms2d.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# xmms2-launcher cmdline parameters
-#
-XMMS2_PARAMETERS=""
-
-#
-# xmms2 user
-# You may want to add user to run xmms or use your username
-#
-XMMS2_USER="xmms2user"
-
-#
-# If you set XMMS2_USER to a different user than the one who will be controlling
-# xmms2d using xmms2 clients, make sure that the clients are aware of the path to
-# xmms2d's IPC socket, or they might not be able to connect. On failure to connect
-# some clients will try to run xmms2d themselves. These xmms2d instances will of
-# course run as the user running the client, and not as the one configured below.
-#
-# If an IPC path is specified on the command line to xmms2d (using
-# XMMS2_PARAMETERS="-i tcp://127.0.0.1:9667"
-# for instance) that will be used. If not, xmms2d will use the path from its
-# configuration file which is typically in ~/.config/xmms2/xmms2.conf. If this
-# fails, a unix socket at /tmp/xmms-ipc-[username] will be used, where username
-# is of the user starting xmms2d.
-#
-# Clients typically try to get the ipc path from the XMMS_PATH environment variable,
-# (which might be set by adding say 'export XMMS_PATH="tcp://127.0.0.1:9667"' to
-# ~/.profile). If this fails they can check their configuration file (if they have
-# one) and finally use unix:///tmp/xmms-ipc-[username], where username is of the user
-# starting the client. Upon failing to connect some will try to start xmms2d themselves.
-#
diff --git a/community-testing/xmms2/xmms2d.rc b/community-testing/xmms2/xmms2d.rc
deleted file mode 100755
index 9d4d2b7e9..000000000
--- a/community-testing/xmms2/xmms2d.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/xmms2d.conf
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof xmms2d xmms2-et`
-case "$1" in
-  start)
-    stat_busy "Starting xmms2d"
-    [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xmms2d
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping xmms2d"
-    [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      for i in `seq 1 10`; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/xvidcap/PKGBUILD b/community-testing/xvidcap/PKGBUILD
deleted file mode 100644
index 6d68a48a9..000000000
--- a/community-testing/xvidcap/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 63169 2010-01-15 14:58:38Z giovanni $
-# Maintainer: Thorsten Töpper <atsutane at freethoughts dot de>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: red_over_blue, Abaddon <kukububu@go2.pl>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=xvidcap
-pkgver=1.1.7
-pkgrel=4
-pkgdesc="A small tool to capture things going on on an X-Windows display to either individual frames or an MPEG video"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://xvidcap.sourceforge.net/"
-depends=('dbus-glib' 'lame' 'libxmu' 'libglade' 'ffmpeg' 'dbus')
-makedepends=('perlxml' 'rarian')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	'xextproto-7.1.1.patch'
-	'xvidcap-ffmpeg.patch'
-        'ffmpeg-0.8.patch')
-md5sums=('b39a682d3ef9fcbf424af771936780e2'
-	'fbde2b076c5ea05723883b87f3ef2a65'
-	'f18817da1c0dada05fa791ae53193b2c')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np1 -i ${srcdir}/xextproto-7.1.1.patch
-  patch -Np0 -i ${srcdir}/xvidcap-ffmpeg.patch 
-  patch -Np1 -i ${srcdir}/ffmpeg-0.8.patch 
-
-  ./configure --prefix=/usr \
-    --with-x \
-    --with-gtk2 \
-    --enable-libmp3lame \
-    --without-forced-embedded-ffmpeg
-  make 
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=${pkgdir}/usr install 
-}
-md5sums=('b39a682d3ef9fcbf424af771936780e2'
-         'fbde2b076c5ea05723883b87f3ef2a65'
-         'f18817da1c0dada05fa791ae53193b2c'
-         '36ead5f0345ae776601d49c1c90cb101')
-md5sums=('b39a682d3ef9fcbf424af771936780e2'
-         'fbde2b076c5ea05723883b87f3ef2a65'
-         'f18817da1c0dada05fa791ae53193b2c'
-         '6e4dfab56b877362757092f55ad6b337')
diff --git a/community-testing/xvidcap/ffmpeg-0.8.patch b/community-testing/xvidcap/ffmpeg-0.8.patch
deleted file mode 100644
index 511333a0f..000000000
--- a/community-testing/xvidcap/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -aur xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7.new/src/xtoffmpeg.c
---- xvidcap-1.1.7/src/xtoffmpeg.c	2008-05-25 22:01:54.000000000 +0000
-+++ xvidcap-1.1.7.new/src/xtoffmpeg.c	2011-10-31 20:41:08.259171263 +0000
-@@ -361,7 +361,7 @@
-     }
-     // put sample parameters
-     au_c->codec_id = xvc_audio_codecs[job->au_targetCodec].ffmpeg_id;
--    au_c->codec_type = CODEC_TYPE_AUDIO;
-+    au_c->codec_type = AVMEDIA_TYPE_AUDIO;
-     au_c->bit_rate = target->sndsize;
-     au_c->sample_rate = target->sndrate;
-     au_c->channels = target->sndchannels;
-@@ -567,7 +567,7 @@
-                     av_rescale_q (enc->coded_frame->pts, enc->time_base,
-                                   ost->st->time_base);
-             }
--            pkt.flags |= PKT_FLAG_KEY;
-+            pkt.flags |= AV_PKT_FLAG_KEY;
-             pkt.stream_index = ost->st->index;
- 
-             pkt.data = audio_out;
-@@ -627,7 +627,7 @@
-             pkt.pts =
-                 av_rescale_q (enc->coded_frame->pts, enc->time_base,
-                               ost->st->time_base);
--        pkt.flags |= PKT_FLAG_KEY;
-+        pkt.flags |= AV_PKT_FLAG_KEY;
-         av_interleaved_write_frame (s, &pkt);
-     }
- 
-@@ -681,7 +681,7 @@
-     if (ret <= 0) {
-         ret = avcodec_encode_audio (enc, bit_buffer, bit_buffer_size, NULL);
-     }
--    pkt.flags |= PKT_FLAG_KEY;
-+    pkt.flags |= AV_PKT_FLAG_KEY;
- 
-     if (samples) {
-         av_free (samples);
-@@ -905,7 +905,7 @@
-                               ost->time_base);
-         }
-         if (enc->coded_frame->key_frame)
--            pkt.flags |= PKT_FLAG_KEY;
-+            pkt.flags |= AV_PKT_FLAG_KEY;
-     }
- 
-     pkt.stream_index = ost->index;
-@@ -1157,7 +1157,7 @@
-     }
- 
-     st->codec->codec_id = codec_id;
--    st->codec->codec_type = CODEC_TYPE_VIDEO;
-+    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- 
-     // find the video encoder
-     codec = avcodec_find_encoder (st->codec->codec_id);
-@@ -1439,13 +1439,13 @@
-         // guess AVOutputFormat
-         if (job->target >= CAP_MF)
-             file_oformat =
--                guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL);
-+                av_guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL);
-         else {
-             char tmp_fn[30];
- 
-             snprintf (tmp_fn, 29, "test-%%d.%s",
-                       xvc_formats[job->target].extensions[0]);
--            file_oformat = guess_format (NULL, tmp_fn, NULL);
-+            file_oformat = av_guess_format (NULL, tmp_fn, NULL);
-         }
-         if (!file_oformat) {
-             fprintf (stderr,
-@@ -1466,7 +1466,7 @@
- #endif     // DEBUG
- 
-         // prepare AVFormatContext
--        output_file = av_alloc_format_context ();
-+        output_file = avformat_alloc_context();
-         if (!output_file) {
-             fprintf (stderr,
-                      _
diff --git a/community-testing/xvidcap/xextproto-7.1.1.patch b/community-testing/xvidcap/xextproto-7.1.1.patch
deleted file mode 100644
index b65da0ee7..000000000
--- a/community-testing/xvidcap/xextproto-7.1.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xvidcap-1.1.7/src/capture.c.orig	2008-05-26 02:01:53.000000000 +0400
-+++ xvidcap-1.1.7/src/capture.c	2009-12-12 00:12:31.368260518 +0300
-@@ -65,7 +65,7 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <X11/extensions/XShm.h>
--#include <X11/extensions/shmstr.h>
-+#include <X11/extensions/shmproto.h>
- #ifndef SOLARIS
- #include <X11/extensions/extutil.h>
- #endif     // SOLARIS
diff --git a/community-testing/xvidcap/xvidcap-ffmpeg.patch b/community-testing/xvidcap/xvidcap-ffmpeg.patch
deleted file mode 100644
index 3a74bf508..000000000
--- a/community-testing/xvidcap/xvidcap-ffmpeg.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: src/codecs.c
-===================================================================
---- src/codecs.c	(revision 319)
-+++ src/codecs.c	(working copy)
-@@ -43,8 +43,8 @@
- #include <locale.h>
- 
- #ifdef USE_FFMPEG
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- #endif     // USE_FFMPEG
- 
- #include "app_data.h"
-Index: src/xtoffmpeg.c
-===================================================================
---- src/xtoffmpeg.c	(revision 319)
-+++ src/xtoffmpeg.c	(working copy)
-@@ -56,13 +56,13 @@
- #include "xvidcap-intl.h"
- 
- // ffmpeg stuff
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avdevice.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavdevice/avdevice.h>
- //#include <ffmpeg/dsputil.h>
--#include <ffmpeg/swscale.h>
--#include <ffmpeg/rgb2rgb.h>
--#include <ffmpeg/fifo.h>
-+#include <libswscale/swscale.h>
-+#include <libavutil/pixfmt.h>
-+#include <libavutil/fifo.h>
- #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \
-                         || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \
-                         || (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 \
-@@ -96,9 +96,10 @@
-                         || (x)==PIX_FMT_YUVJ420P || (x)==PIX_FMT_YUVJ422P \
-                         || (x)==PIX_FMT_YUVJ444P)
- 
--#define PIX_FMT_ARGB32 PIX_FMT_RGBA32  /* this is just my personal
--                                        * convenience */
-+#define PIX_FMT_ARGB32 PIX_FMT_RGB32   /* this is just my personal
-+                                         * convenience */
- 
-+
- /*
-  * file globals
-  */
-@@ -1248,7 +1249,11 @@
-     st->codec->flags |= CODEC_FLAG2_FAST;
-     // there is no trellis quantiser in libav* for mjpeg
-     if (st->codec->codec_id != CODEC_ID_MJPEG)
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         st->codec->flags |= CODEC_FLAG_TRELLIS_QUANT;
-+#else
-+	st->codec->trellis = 1;
-+#endif
-     st->codec->flags &= ~CODEC_FLAG_OBMC;
-     // some formats want stream headers to be seperate
-     if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-@@ -1498,11 +1503,10 @@
-         // add the video stream and initialize the codecs
-         //
-         // prepare stream
--        out_st =
--            add_video_stream (output_file, image,
--                              (input_pixfmt ==
--                               PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt),
--                              xvc_codecs[job->targetCodec].ffmpeg_id, job);
-+        fprintf(stderr, "The current pixfmt is %d, but the choosen one is %d\n", input_pixfmt, (input_pixfmt == PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt));
-+        out_st = add_video_stream (output_file, image,
-+                     (input_pixfmt == PIX_FMT_PAL8 ? PIX_FMT_RGB24 : input_pixfmt),
-+                      xvc_codecs[job->targetCodec].ffmpeg_id, job);
- 
-         // FIXME: set params
-         // memset (p_fParams, 0, sizeof(*p_fParams));
-Index: src/main.c
-===================================================================
---- src/main.c	(revision 319)
-+++ src/main.c	(working copy)
-@@ -45,7 +45,7 @@
- #include <locale.h>
- 
- #ifdef USE_FFMPEG
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- #endif     // USE_FFMPEG
- 
- #include "control.h"
-@@ -217,9 +217,6 @@
- 
-     if (app)
-         xvc_appdata_free (app);
--#ifdef USE_FFMPEG
--    av_free_static ();
--#endif
- }
- 
- /**
-
- 	  	 
diff --git a/community/asunder/PKGBUILD b/community/asunder/PKGBUILD
deleted file mode 100644
index e4c017bb4..000000000
--- a/community/asunder/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 36555 2011-01-04 17:21:48Z xyne $
-# Maintainer: Xyne <ac xunilhcra enyx, backwards>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: cs-cam - me.at.camdaniel.com
-# Contributor: Sebastien Piccand <sebcactus gmail com>
-
-pkgname=asunder
-pkgver=2.1
-pkgrel=1
-pkgdesc="a graphical CD ripper and encoder"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://littlesvr.ca/asunder/"
-license=('GPL2')
-depends=('gtk2' 'libcddb' 'cdparanoia')
-makedepends=('pkgconfig')
-optdepends=('lame: for mp3 support' 'vorbis-tools: for ogg support' \
-	'flac: for flac support')
-source=(http://littlesvr.ca/asunder/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('05419a29fd31321f0823c3f90ee1b911')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/community/electricsheep/ChangeLog b/community/electricsheep/ChangeLog
deleted file mode 100644
index 516a16a97..000000000
--- a/community/electricsheep/ChangeLog
+++ /dev/null
@@ -1,30 +0,0 @@
-2010-09-26  Eric Belanger  <eric@archlinux.org>
-
-	* electricsheep 2.7b12-3
-	* Rebuilt against new ffmpeg to improve performance
-
-2009-10-17  Eric Belanger  <eric@archlinux.org>
-
-	* electricsheep 2.7b12-2
-	* Added xscreensaver config
-	* Updated url
-
-2009-07-09  Eric Belanger  <eric@archlinux.org>
-
-	* electricsheep 2.7b12-1
-	* Upstream update
-	* Switched to svn snapshot as source tarballs are no longer provided
-	* Updated url
-	* Splitted flam3 in a separate package
-	* Updated depends
-	* Removed install scriptlet
-
-2008-09-20  Eric Belanger  <eric@archlinux.org>
-
-	* electricsheep 2.6.8-4
-	* Updated for KDE 4 (close FS#11378)
-	* Added xscreensaver optdepends to cleanup post-install messages
-	* FHS man pages
-	* Fixed build issue
-	* Added xscreensaver makedepends and config
-	* Added ChangeLog
diff --git a/community/gshare/PKGBUILD b/community/gshare/PKGBUILD
deleted file mode 100644
index 4d0e43561..000000000
--- a/community/gshare/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 18374 2010-06-03 15:40:23Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gshare
-pkgver=0.94
-pkgrel=4
-pkgdesc="Easy file sharing for Gnome"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/gshare-project"
-license=('GPL')
-depends=('gtk-sharp-2' 'avahi' 'gnome-sharp')
-install=$pkgname.install
-options=('!makeflags')
-source=(http://ftp.de.debian.org/debian/pool/main/g/gshare/gshare_$pkgver.orig.tar.gz
-	http://ftp.de.debian.org/debian/pool/main/g/gshare/gshare_$pkgver-10.diff.gz)
-md5sums=('bfb05ba7502218e9d9cacc7916098a03'
-         '3dd6000e9afc0db819a6ec69047b440d')
-
-build() {
-  export MONO_SHARED_DIR=$srcdir/.wabi
-  mkdir -p $MONO_SHARED_DIR
-
-  cd $srcdir/gshare-$pkgver
-  patch -p1 <$srcdir/gshare_$pkgver-10.diff
-  ls -1 debian/patches/*.patch | while read A; do patch -p1 <$A; done
-  ./configure --prefix=/usr --sysconfdir=/usr/share --with-dbus-service-dir=/usr/share/dbus-1/services --disable-schemas-install
-  sed -i 's/-scrollkeeper-update/#-scrollkeeper-update/' help/C/Makefile
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  mv $pkgdir/usr/share/gshare/gshared.desktop $pkgdir/usr/share/applications/
-  rm -r $pkgdir/usr/share/gshare
-
-  rm -r $MONO_SHARED_DIR
-}
diff --git a/community/gshare/gshare.install b/community/gshare/gshare.install
deleted file mode 100644
index f1eac39c1..000000000
--- a/community/gshare/gshare.install
+++ /dev/null
@@ -1,40 +0,0 @@
-pkgname=gshare
-
-post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  scrollkeeper-update -q -p var/lib/scrollkeeper
-  update-desktop-database -q
-
-cat << EOF
->>> To start the ftp server have gshared start up with your session by 
->>> going to:    Desktop -> Preferences -> Sessions
-EOF
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
-}
-
-post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
-  update-desktop-database -q
-}
-
diff --git a/community/gshare/monofix.patch b/community/gshare/monofix.patch
deleted file mode 100644
index 0888c3c3e..000000000
--- a/community/gshare/monofix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -rN -u old-gshare/src/gshared/daemon.cs new-gshare/src/gshared/daemon.cs
---- old-gshare/src/gshared/daemon.cs	2006-09-16 20:31:47.881173352 +0100
-+++ new-gshare/src/gshared/daemon.cs	2006-09-16 20:31:47.959161496 +0100
-@@ -308,11 +308,11 @@
-             if (reason == FTPServerShutdownReason.Error)
-             {
-                 Log.ErrorMessage("Shutting down FTP server because of an error");
--                Utility.InvokeLater(delegate
-+                Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                     { 
-                         Utility.ShowGenericFatalErrorDialog(); 
-                         Shutdown(); 
--                    });
-+                    }));
-             }
-         }
-         
-@@ -367,24 +367,24 @@
-             {
-                 case ClientState.Collision:
-                     /*TODO figure out what to do*/
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         { 
-                             StopDaemon();
--                        });
-+                        }));
-                     break;
-                 case ClientState.Failure:
-                     Log.ErrorMessage("Zeroconf client failed to register");
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         {
-                             Utility.ShowCannotPublishServiceDialog(); 
-                             Shutdown(); 
--                        });
-+                        }));
-                     break;
-                 case ClientState.Running:
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         {
-                             PublishFTPServer(); 
--                        });
-+                        }));
-                     break;
-             }
- 
-@@ -410,19 +410,19 @@
-                         iAvahiServiceName = EntryGroup.GetAlternativeServiceName(iAvahiServiceName);
-                     }
-                     
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         {
-                             StartZeroConf(iFtpServer.ServerPort);
--                        });
-+                        }));
-                     
-                     break;
-                 case EntryGroupState.Failure:
-                     Log.ErrorMessage("Failed to publish FTP service on zeroconf network");
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         {
-                             Utility.ShowCannotPublishServiceDialog();
-                             Shutdown(); 
--                        });
-+                        }));
-                     break;
- 
-                 case EntryGroupState.Established:
-@@ -460,11 +460,11 @@
-                                     ex.Message,
-                                     ex.StackTrace);
-                                 
--                Utility.InvokeLater(delegate 
-+                Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate 
-                     {
-                         Utility.ShowCannotPublishServiceDialog(); 
-                         Shutdown(); 
--                    });
-+                    }));
-                 
-             }
- 
-
diff --git a/community/kim4/PKGBUILD b/community/kim4/PKGBUILD
deleted file mode 100644
index 1c64d4b3c..000000000
--- a/community/kim4/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: raku <raczkow@gmail.com>
-
-pkgname=kim4
-pkgver=0.9.5
-pkgrel=3
-pkgdesc="Kde Image Menu to compress, resize, convert, rename and much more"
-arch=(i686 x86_64 'mips64el')
-url="http://www.kde-apps.org/content/show.php?content=11505"
-license=('GPL')
-depends=('imagemagick' 'kdebase-dolphin')
-source=(http://bouveyron.free.fr/kim/release/$pkgname-$pkgver.tar.gz)
-md5sums=('c7934ab0dbf988da5f60d9c4cbf97dd5')
-	 
-build() {
-  cd ${srcdir}/${pkgname}/src
-
-  install -d ${pkgdir}/usr/share/kde4/services/ServiceMenus
-  install -Dm644 kim_{compressandresize,convertandrotate,publication}.desktop \
-    ${pkgdir}/usr/share/kde4/services/ServiceMenus || return 1
-  install -d ${pkgdir}/usr/bin
-  install -Dm755 bin/kim_{album,compress,convert,flipflop,galery,multiburst,other,pelemele} \
-    bin/kim_{print,record,record_mpg,rename,resize,resizeandsend,rotate,rotatewithexif} \
-    bin/kim_{slideshow,sortbydate,treatment,webexport} ${pkgdir}/usr/bin/ || return 1
-  install -d ${pkgdir}/usr/share/kim/slideshow
-  install -Dm644 slideshow/{dewslider.swf,index.part1,index.part2} \
-    ${pkgdir}/usr/share/kim/slideshow || return 1
-  install -d ${pkgdir}/usr/share/kim/gallery
-  install -Dm644 gallery/{index.part1,index.part2} \
-    ${pkgdir}/usr/share/kim/gallery || return 1
-}
diff --git a/community/libreplaygain/ChangeLog b/community/libreplaygain/ChangeLog
deleted file mode 100644
index e5a5d81dd..000000000
--- a/community/libreplaygain/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2010-02-04  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* PKGBUILD: added to [community]
diff --git a/community/listen/PKGBUILD b/community/listen/PKGBUILD
deleted file mode 100644
index ddfb63650..000000000
--- a/community/listen/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 55644 2011-09-17 00:51:14Z ebelanger $
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Hugo Doria <hugodoria@gmail.com>
-
-pkgname=listen
-pkgver=0.6.5
-pkgrel=8
-pkgdesc="Music player and management for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.listen-project.org/"
-license=('GPL2')
-depends=('python2-egg' 'python2-libgnome' 'mutagen' 'desktop-file-utils'
-         'gnome-icon-theme' 'gstreamer0.10-python' 'notification-daemon' 'pyxdg'
-         'pywebkitgtk' 'python2-pyinotify' 'gstreamer0.10-good-plugins' 'dbus-python')
-makedepends=('intltool' 'docbook2x' 'docbook-xml')
-optdepends=('python-musicbrainz2: musicbrainz & cd support'
-            'libgpod: iPod support'
-            'python-daap: DAAP support'
-            'tunepimp: tagging support')
-install=listen.install
-source=("http://download.listen-project.org/0.6/${pkgname}-${pkgver}.tar.gz")
-md5sums=('76cd9ad2fc9c600dbdf4808c15aeccf1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  chmod +x mmkeys/setup.py
-
-  # Fix command name
-  sed -i 's/docbook2x-man/docbook2man/' Makefile
-
-  # Point Python scripts to the python2 binary
-  sed -i -e 's/python -/python2 -/' \
-         -e 's/PYTHON  = python$/\02/' \
-    Makefile
-  sed -i 's/env python$/env python2/' mmkeys/setup.py
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' src/listen
-
-  make CHECK_DEPENDS=0 PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" PREFIX=/usr install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/listen/listen.install b/community/listen/listen.install
deleted file mode 100644
index 5e5cfef4d..000000000
--- a/community/listen/listen.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/community/luxrender/luxrender.install b/community/luxrender/luxrender.install
deleted file mode 100644
index 5be530d50..000000000
--- a/community/luxrender/luxrender.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  cat << EOF
-To enable OpenCL support you need to install one of the following packages:
-    * nvidia-utils for nVidia GPUs
-    * amdstram for AMD GPUs
-    * intel-opencl-sdk for Intel CPUs
-EOF
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/lxdm/Xsession.patch b/community/lxdm/Xsession.patch
deleted file mode 100644
index a9ba63233..000000000
--- a/community/lxdm/Xsession.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- data/Xsession.orig	2010-01-31 20:48:08.695677408 -0200
-+++ data/Xsession	2010-01-31 20:47:48.260223292 -0200
-@@ -2,6 +2,11 @@
-
- # use bash for "exec -l", howto run login shell by /bin/sh ?
-
-+[[ -f /etc/profile ]] && . /etc/profile
-+[[ -f "$HOME/.profile" ]] && . "$HOME/.profile"
-+[[ -f /etc/xprofile ]] && . /etc/xprofile
-+[[ -f "$HOME/.xprofile" ]] && . "$HOME/.xprofile"
-+
- if [ $# -eq 1 -a -n "$1" ]; then
- 	LXSESSION=$1
- else
diff --git a/community/mercury/PKGBUILD b/community/mercury/PKGBUILD
deleted file mode 100644
index 05984636b..000000000
--- a/community/mercury/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-#$Id: PKGBUILD 2282 2009-09-14 07:35:54Z giovanni $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: DaNiMoTh <jjdanimoth@gmail.com>
-
-pkgname=mercury
-pkgver=1.9.5
-pkgrel=2
-pkgdesc="Java Based MSN client."
-license=('custom')
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.mercury.im"
-depends=('java-runtime' 'libxss' 'libxt')
-makedepends=('rpmextract')
-source=(http://thebachman.info/public/Versions_Ubuntu/${pkgname}-messenger-${pkgver}-2.all.rpm
-	"license.txt")
-md5sums=('7d5835cf1ac7864386efe42b9cf67d6b'
-         '6ce0e815d63db6ac55a28e8d52c3f8da')
-
-build() {
-  cd "$srcdir"
-
-  rpmextract.sh ${pkgname}-messenger-${pkgver}-2.all.rpm
-
-  install -d "$pkgdir/usr/share/java/mercury"
-  cp -r usr "$pkgdir"
-  mv "$pkgdir/usr/share/mercury" "$pkgdir/usr/share/java/"
-
-  # FS#16171
-  find ${pkgdir} -type f -exec chmod -R 644 {} \;
-  find ${pkgdir} -type d -exec chmod 755 {} \;
-  chmod 755 ${pkgdir}/usr/share/java/mercury/startup/startup_linux.sh
-  
-  install -D -m644 "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -rf "$pkgdir/usr/bin/mercury"
-  ln -s /usr/share/java/mercury/startup/startup_linux.sh "$pkgdir/usr/bin/mercury"
-}
diff --git a/community/mercury/license.txt b/community/mercury/license.txt
deleted file mode 100644
index 43e416eff..000000000
--- a/community/mercury/license.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Mercury is Freeware. It is not distributed with source code since it's closed source. 
-
-You are allowed to change the setting files. 
-You are allowed to redistribute Mercury. 
-
-http://www.mercury.to/index.php?page=Wiki&wikipage=License
-
-
diff --git a/community/mplayer2/mplayer2-SAMI-subs.patch b/community/mplayer2/mplayer2-SAMI-subs.patch
deleted file mode 100644
index 8238167e2..000000000
--- a/community/mplayer2/mplayer2-SAMI-subs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mplayer2-2.0.ori/sub/subreader.c mplayer2-2.0/sub/subreader.c
---- mplayer2-2.0.ori/sub/subreader.c	2011-03-24 17:40:29.000000000 -0400
-+++ mplayer2-2.0/sub/subreader.c	2011-10-14 15:04:47.196477670 -0400
-@@ -179,6 +179,8 @@
- 	    break;
- 
- 	case 3: /* get all text until '<' appears */
-+	    if (p - text >= LINE_LEN)
-+	        sami_add_line(current, text, &p);
- 	    if (*s == '\0') break;
- 	    else if (!strncasecmp (s, "<br>", 4)) {
-                 sami_add_line(current, text, &p);
diff --git a/community/mplayer2/mplayer2-remove-mp3lib.patch b/community/mplayer2/mplayer2-remove-mp3lib.patch
deleted file mode 100644
index 057a91295..000000000
--- a/community/mplayer2/mplayer2-remove-mp3lib.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff -Naur mplayer2-2.0.ori/configure mplayer2-2.0/configure
---- mplayer2-2.0.ori/configure	2011-03-24 17:40:29.000000000 -0400
-+++ mplayer2-2.0/configure	2011-05-09 14:11:10.717630210 -0400
-@@ -376,7 +376,6 @@
-   --disable-mad             disable libmad (MPEG audio) support [autodetect]
-   --enable-xmms             enable XMMS input plugin support [disabled]
-   --enable-libdca           enable libdca support [autodetect]
--  --disable-mp3lib          disable builtin mp3lib [autodetect]
-   --disable-liba52          disable liba52 [autodetect]
-   --enable-musepack         enable libmpcdec support (deprecated, libavcodec
-                             Musepack decoder is preferred) [disabled]
-@@ -610,7 +609,6 @@
- _speex=auto
- _theora=auto
- _mpg123=auto
--_mp3lib=auto
- _liba52=auto
- _libdca=auto
- _faad=auto
-@@ -965,8 +963,6 @@
-   --disable-theora)     _theora=no      ;;
-   --enable-mpg123)      _mpg123=yes     ;;
-   --disable-mpg123)     _mpg123=no      ;;
--  --enable-mp3lib)      _mp3lib=yes     ;;
--  --disable-mp3lib)     _mp3lib=no      ;;
-   --enable-liba52)      _liba52=yes     ;;
-   --disable-liba52)     _liba52=no      ;;
-   --enable-libdca)      _libdca=yes     ;;
-@@ -5731,19 +5727,6 @@
- fi
- echores "$_theora"
- 
--echocheck "mp3lib support"
--if test "$_mp3lib" = auto ; then
--  test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes
--fi
--if test "$_mp3lib" = yes ; then
--  def_mp3lib='#define CONFIG_MP3LIB 1'
--  codecmodules="mp3lib(internal) $codecmodules"
--else
--  def_mp3lib='#undef CONFIG_MP3LIB'
--  nocodecmodules="mp3lib(internal) $nocodecmodules"
--fi
--echores "$_mp3lib"
--
- # Any version of libmpg123 shall be fine.
- echocheck "mpg123 support"
- def_mpg123='#undef CONFIG_MPG123'
-@@ -6823,7 +6806,6 @@
- MD5SUM = $_md5sum
- MGA = $_mga
- MNG = $_mng
--MP3LIB = $_mp3lib
- MPG123 = $_mpg123
- MUSEPACK = $_musepack
- NAS = $_nas
-@@ -7084,7 +7066,6 @@
- $def_libdca
- $def_libdv
- $def_mad
--$def_mp3lib
- $def_mpg123
- $def_musepack
- $def_speex
-diff -Naur mplayer2-2.0.ori/etc/codecs.conf mplayer2-2.0/etc/codecs.conf
---- mplayer2-2.0.ori/etc/codecs.conf	2011-03-24 17:40:29.000000000 -0400
-+++ mplayer2-2.0/etc/codecs.conf	2011-05-09 14:11:10.717630210 -0400
-@@ -4220,23 +4220,6 @@
-   driver ffmpeg
-   dll "sonic"
- 
--audiocodec mp3
--  ; this is preferred over ffmp2/ffmp3 since it is faster due to using
--  ; floating point and there are even broken mkv files where the audio
--  ; needs to be parsed, making this codec work more reliably
--  info "mp3lib MPEG layer-2, layer-3"
--  status working
--  comment "Optimized to MMX/SSE/3Dnow!"
--  format 0x50        ; layer-1 && layer-2
--  format 0x55        ; layer-3
--  format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
--  format 0x5000736d  ; "ms\0\x50" older mp2 fcc (MOV files)
--  format 0x55005354  ;  broken file
--  fourcc ".mp3"      ; CBR/VBR MP3 (MOV files)
--  fourcc "MP3 "      ; used in .nsv files
--  fourcc "LAME"      ; used in mythtv .nuv files
--  driver mp3lib
--
- audiocodec mpg123
-   ; this is preferred over ffmp2/ffmp3 since it is faster, generally
-   info "MPEG 1.0/2.0/2.5 layers I, II, III"
-diff -Naur mplayer2-2.0.ori/libmpcodecs/ad.c mplayer2-2.0/libmpcodecs/ad.c
---- mplayer2-2.0.ori/libmpcodecs/ad.c	2011-03-24 17:40:29.000000000 -0400
-+++ mplayer2-2.0/libmpcodecs/ad.c	2011-05-09 14:11:10.717630210 -0400
-@@ -32,7 +32,6 @@
- /* Missed vorbis, mad, dshow */
- 
- extern const ad_functions_t mpcodecs_ad_mpg123;
--extern const ad_functions_t mpcodecs_ad_mp3lib;
- extern const ad_functions_t mpcodecs_ad_ffmpeg;
- extern const ad_functions_t mpcodecs_ad_liba52;
- extern const ad_functions_t mpcodecs_ad_hwac3;
-@@ -63,9 +62,6 @@
- #ifdef CONFIG_MPG123
-   &mpcodecs_ad_mpg123,
- #endif
--#ifdef CONFIG_MP3LIB
--  &mpcodecs_ad_mp3lib,
--#endif
- #ifdef CONFIG_LIBA52
-   &mpcodecs_ad_liba52,
- #endif
-diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c mplayer2-2.0/libmpcodecs/ad_mp3lib.c
---- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c	2011-03-24 17:40:29.000000000 -0400
-+++ mplayer2-2.0/libmpcodecs/ad_mp3lib.c	2011-05-09 14:11:10.717630210 -0400
-@@ -1,100 +0,0 @@
--/*
-- * This file is part of MPlayer.
-- *
-- * MPlayer 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.
-- *
-- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
-- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-- */
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <unistd.h>
--
--#include "config.h"
--
--#include "ad_internal.h"
--#include "ad_mp3lib.h"
--
--static const ad_info_t info =
--{
--	"MPEG layer-2, layer-3",
--	"mp3lib",
--	"Nick Kurshev",
--	"mpg123",
--	"Optimized to MMX/SSE/3Dnow!"
--};
--
--LIBAD_EXTERN(mp3lib)
--
--#include "mp3lib/mp3.h"
--
--extern int fakemono;
--
--static sh_audio_t* dec_audio_sh=NULL;
--
--// MP3 decoder buffer callback:
--int mplayer_audio_read(char *buf,int size){
--  return demux_read_data(dec_audio_sh->ds,buf,size);
--}
--
--static int preinit(sh_audio_t *sh)
--{
--  sh->audio_out_minsize=32*36*2*2; //4608;
--  return 1;
--}
--
--static int init(sh_audio_t *sh)
--{
--  // MPEG Audio:
--  dec_audio_sh=sh; // save sh_audio for the callback:
--//  MP3_Init(fakemono,mplayer_accel,&mplayer_audio_read); // TODO!!!
--#ifdef CONFIG_FAKE_MONO
--  MP3_Init(fakemono);
--#else
--  MP3_Init();
--#endif
--  MP3_samplerate=MP3_channels=0;
--  sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1);
--  if(!sh->a_buffer_len) return 0; // unsupported layer/format
--  sh->channels=2; // hack
--  sh->samplesize=2;
--  sh->samplerate=MP3_samplerate;
--  sh->i_bps=MP3_bitrate*(1000/8);
--  MP3_PrintHeader();
--  return 1;
--}
--
--static void uninit(sh_audio_t *sh)
--{
--}
--
--static int control(sh_audio_t *sh,int cmd,void* arg, ...)
--{
--    switch(cmd)
--    {
--      case ADCTRL_RESYNC_STREAM:
--          MP3_DecodeFrame(NULL,-2); // resync
--          MP3_DecodeFrame(NULL,-2); // resync
--          MP3_DecodeFrame(NULL,-2); // resync
--	  return CONTROL_TRUE;
--      case ADCTRL_SKIP_FRAME:
--	  MP3_DecodeFrame(NULL,-2); // skip MPEG frame
--	  return CONTROL_TRUE;
--    }
--  return CONTROL_UNKNOWN;
--}
--
--static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
--{
--   return MP3_DecodeFrame(buf,-1);
--}
-diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h mplayer2-2.0/libmpcodecs/ad_mp3lib.h
---- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h	2011-03-24 17:40:29.000000000 -0400
-+++ mplayer2-2.0/libmpcodecs/ad_mp3lib.h	2011-05-09 14:11:10.717630210 -0400
-@@ -1,24 +0,0 @@
--/*
-- * This file is part of MPlayer.
-- *
-- * MPlayer 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.
-- *
-- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
-- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-- */
--
--#ifndef MPLAYER_AD_MP3LIB_H
--#define MPLAYER_AD_MP3LIB_H
--
--int mplayer_audio_read(char *buf, int size);
--
--#endif /* MPLAYER_AD_MP3LIB_H */
-diff -Naur mplayer2-2.0.ori/Makefile mplayer2-2.0/Makefile
---- mplayer2-2.0.ori/Makefile	2011-03-24 17:40:29.000000000 -0400
-+++ mplayer2-2.0/Makefile	2011-05-09 14:11:10.714296876 -0400
-@@ -122,21 +122,6 @@
- SRCS_COMMON-$(MNG)                   += libmpdemux/demux_mng.c
- SRCS_COMMON-$(MPG123)                += libmpcodecs/ad_mpg123.c
- 
--SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW)     += mp3lib/dct36_3dnow.c \
--                                        mp3lib/dct64_3dnow.c
--SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT)  += mp3lib/dct36_k7.c \
--                                        mp3lib/dct64_k7.c
--SRCS_MP3LIB-X86-$(HAVE_MMX)          += mp3lib/dct64_mmx.c
--SRCS_MP3LIB-$(ARCH_X86_32)           += mp3lib/decode_i586.c \
--                                        $(SRCS_MP3LIB-X86-yes)
--SRCS_MP3LIB-$(HAVE_ALTIVEC)          += mp3lib/dct64_altivec.c
--SRCS_MP3LIB-$(HAVE_MMX)              += mp3lib/decode_mmx.c
--SRCS_MP3LIB-$(HAVE_SSE)              += mp3lib/dct64_sse.c
--SRCS_MP3LIB                          += mp3lib/sr1.c \
--                                        $(SRCS_MP3LIB-yes)
--SRCS_COMMON-$(MP3LIB)                += libmpcodecs/ad_mp3lib.c \
--                                        $(SRCS_MP3LIB)
--
- SRCS_COMMON-$(MUSEPACK)              += libmpcodecs/ad_mpc.c \
-                                         libmpdemux/demux_mpc.c
- SRCS_COMMON-$(NATIVE_RTSP)           += stream/stream_rtsp.c \
-@@ -578,7 +563,6 @@
-         loader/dshow \
-         loader/dmo \
-         loader/wine \
--        mp3lib \
-         osdep \
-         stream \
-         stream/freesdp \
-@@ -675,8 +659,6 @@
- #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
- loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)
- 
--mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer
--
- stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS)
- 
- 
-@@ -767,9 +749,7 @@
- loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
- loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
- 
--mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS)
--
--TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
-+TESTS = codecs2html codec-cfg-test libvo/aspecttest
- 
- ifdef ARCH_X86
- TESTS += loader/qtx/list loader/qtx/qtxload
diff --git a/community/musescore/QtEvent.patch b/community/musescore/QtEvent.patch
deleted file mode 100644
index d8aa1562d..000000000
--- a/community/musescore/QtEvent.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur mscore-0.9.6.3.orig/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp mscore-0.9.6.3.new/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp
---- mscore-0.9.6.3.orig/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp	2010-10-12 22:01:35.000000000 +0200
-+++ mscore-0.9.6.3.new/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp	2010-10-12 22:03:11.000000000 +0200
-@@ -214,7 +214,6 @@
-     , QEvent::UngrabMouse
-     , QEvent::GrabKeyboard
-     , QEvent::UngrabKeyboard
--    , QEvent::CocoaRequestModal
-     , QEvent::User
-     , QEvent::MaxUser
- };
-@@ -362,7 +361,6 @@
-     , "UngrabMouse"
-     , "GrabKeyboard"
-     , "UngrabKeyboard"
--    , "CocoaRequestModal"
-     , "User"
-     , "MaxUser"
- };
diff --git a/community/paraview/paraview.profile b/community/paraview/paraview.profile
deleted file mode 100644
index cb4bbde8c..000000000
--- a/community/paraview/paraview.profile
+++ /dev/null
@@ -1 +0,0 @@
-export PATH=$PATH:/opt/paraview/bin
diff --git a/community/python-scipy/python-scipy.changelog b/community/python-scipy/python-scipy.changelog
deleted file mode 100644
index 76a3e7f35..000000000
--- a/community/python-scipy/python-scipy.changelog
+++ /dev/null
@@ -1,49 +0,0 @@
-2011-07-13 Thomas Dziedzic < gostrc at gmail >
-	* 0.9.0-2:
-	rebuild for python3-numpy to python-numpy rename
-	also, minor PKGBUILD cleanup
-
-2011-04-24 Ray Rashif <schiv@archlinux.org>
-
-	* 0.9.0-1:
-	Couldn't release previous update due to lapack/blas issues
-	See http://mailman.archlinux.org/pipermail/arch-general/2011-April/019677.html
-	Hopefully symlink trick from AUR/python3-scipy fixes that
-
-2011-04-05 Ray Rashif <schiv@archlinux.org>
-
-	* 0.9.0-1:
-	Upstream release
-	SciPy now supports Python 3
-	Package split for python(3), python2
-	PKGBUILD cleanup
-
-2010-07-29  Angel 'angvp' Velasquez <angvp@archlinux.org>
-	* Updated to: 0.8.0
-2009-08-05  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated to: 0.7.1
-
-2009-02-11  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updating for i686: 0.7
-
-2008-12-12  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updating for i686: 0.7.0 beta 1
-
-2008-11-07  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated to svn as scipy 0.6 wont work with python 2.6
-
-2008-02-21  Eric Belanger  <eric@archlinux.org>
-
-	* Added x86_64 arch tag
-	* Added license
-
-2007-10-29  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Changed email
-	* Fixed some problems in the PKGBUILD
-	* Updated to new release - 0.6.0
-
diff --git a/community/rdiff-backup/ChangeLog b/community/rdiff-backup/ChangeLog
deleted file mode 100644
index b6e02ffe2..000000000
--- a/community/rdiff-backup/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-09-27 Dragonlord <dragonlord@aur.archlinux.org>
-	* updated to major release 1.2.1
-
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-	* Built for x86_64
diff --git a/community/root/root.desktop b/community/root/root.desktop
deleted file mode 100644
index ca382111c..000000000
--- a/community/root/root.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=root
-Terminal=true
-Name=ROOT
-Name[de]=ROOT
-Comment=An object-oriented data analysis framework
-Comment[de]=Ein objektorientiertes Framework zur Datenanalyse
-StartupNotify=true
-MimeType=application/x-root;text/x-c++src
-Categories=Science;Development;Application;
diff --git a/community/rsnapshot/ChangeLog b/community/rsnapshot/ChangeLog
deleted file mode 100644
index 811f87d4f..000000000
--- a/community/rsnapshot/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/spring/awk-java.patch b/community/spring/awk-java.patch
deleted file mode 100644
index 36c932924..000000000
--- a/community/spring/awk-java.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk
---- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-07-26 17:29:16.623158278 +0200
-+++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-07-26 17:33:00.872921328 +0200
-@@ -341,7 +341,7 @@
- }
- 
- # beginn of struct S*Command
--/^\struct S.*Command( \{)?/ {
-+/^struct S.*Command( \{)?/ {
- 
- 	isInsideCmdStruct = 1;
- 	ind_cmdMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk
---- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-07-26 17:29:16.623158278 +0200
-+++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-07-26 17:32:51.009745026 +0200
-@@ -473,7 +473,7 @@
- }
- 
- # beginn of struct S*Event
--/^\struct S.*Event( \{)?/ {
-+/^struct S.*Event( \{)?/ {
- 
- 	isInsideEvtStruct = 1;
- 	ind_evtMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk
---- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-07-26 17:29:16.626491558 +0200
-+++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-07-26 17:30:25.695391913 +0200
-@@ -387,7 +387,7 @@
- }
- 
- # beginn of struct S*Command
--/^\struct S.*Command( \{)?/ {
-+/^struct S.*Command( \{)?/ {
- 
- 	isInsideCmdStruct = 1;
- 	ind_cmdMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk
---- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-07-26 17:29:16.626491558 +0200
-+++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-07-26 17:30:13.942245701 +0200
-@@ -366,7 +366,7 @@
- }
- 
- # beginn of struct S*Event
--/^\struct S.*Event( \{)?/ {
-+/^struct S.*Event( \{)?/ {
- 
- 	isInsideEvtStruct = 1;
- 	ind_evtMember = 0;
diff --git a/community/spring/gcc46.patch b/community/spring/gcc46.patch
deleted file mode 100644
index 4f6865cac..000000000
--- a/community/spring/gcc46.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Jan Dittberner <jandd@debian.org>
-Subject: Patch for FTBFS with g++ 4.6.0
-Bug-Debian: http://bugs.debian.org/625097
-Bug: http://springrts.com/mantis/view.php?id=2415
---- a/AI/Skirmish/E323AI/AAStar.h
-+++ b/AI/Skirmish/E323AI/AAStar.h
-@@ -4,6 +4,7 @@
- #include <queue>
- #include <vector>
- #include <list>
-+#include <cstddef> // for NULL
- 
- class AAStar {
- 	public:
---- a/rts/Rendering/ShadowHandler.cpp
-+++ b/rts/Rendering/ShadowHandler.cpp
-@@ -318,6 +318,11 @@
- 	xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1))));
- 	ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1))));
- 
-+	shadowParams.x = xmid;
-+	shadowParams.y = ymid;
-+	shadowParams.z = p17;
-+	shadowParams.w = p18;
-+
- 	shadowMatrix[ 0] =   cross1.x / maxLengthX;
- 	shadowMatrix[ 4] =   cross1.y / maxLengthX;
- 	shadowMatrix[ 8] =   cross1.z / maxLengthX;
---- a/rts/Rendering/ShadowHandler.h
-+++ b/rts/Rendering/ShadowHandler.h
-@@ -38,7 +38,7 @@
- 	CMatrix44f shadowMatrix;
- 	void CalcMinMaxView(void);
- 
--	const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); }
-+	const float4& GetShadowParams() const { return shadowParams; }
- 
- 	enum ShadowGenProgram {
- 		SHADOWGEN_PROGRAM_MODEL      = 0,
-@@ -76,6 +76,7 @@
- 	//! to write the (FBO) depth-buffer texture
- 	std::vector<Shader::IProgramObject*> shadowGenProgs;
- 
-+	float4 shadowParams;
- 	float x1, x2, y1, y2;
- 	float xmid, ymid;
- 	float p17, p18;
---- a/rts/Rendering/GLContext.cpp
-+++ b/rts/Rendering/GLContext.cpp
-@@ -9,6 +9,7 @@
- #include "GLContext.h"
- 
- #include <list>
-+#include <cstddef>  // for NULL
- 
- 
- using namespace std;
---- a/rts/System/MemPool.h
-+++ b/rts/System/MemPool.h
-@@ -4,6 +4,7 @@
- #define _MEM_POOL_H_
- 
- #include <new>
-+#include <cstddef> // for NULL
- 
- const size_t MAX_MEM_SIZE=200;
- 
diff --git a/community/virtualbox/18-system-xorg.patch b/community/virtualbox/18-system-xorg.patch
deleted file mode 100644
index 4a28b93b6..000000000
--- a/community/virtualbox/18-system-xorg.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-Description: Build the X.Org driver only for the selected system X Server version.
-Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de>
-
-diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-@@ -40,8 +40,8 @@ LIBRARIES += \
- 	VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
--  LIBRARIES += \
--  	VBoxGuestR3LibXFree86
-+#  LIBRARIES += \
-+#  	VBoxGuestR3LibXFree86
-  endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
-diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
- VBoxOGL_INCS           = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_INCS     += \
--	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
--	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
--	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
--	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
--	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
--	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
--	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
--	$(VBOX_PATH_X11_ROOT)/1.3/xorg \
-+	/usr/include/x11 \
-+	/usr/include/xorg \
-+	/usr/include/pixman-1 \
- 	$(VBOX_MESA_INCS) \
--	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+	/usr/include/drm \
-+	/usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
- 
-diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
---- a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
- 
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
-  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-@@ -23,7 +23,6 @@ include	$(KBUILD_PATH)/subheader.kmk
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
-  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
-  vboxmouse_drv_DEFS.linux = linux
-  vboxmouse_drv_DEFS.x86 += __i386__
-@@ -59,7 +58,6 @@ endif
- #
- # vboxmouse_drv_70
- #
--DLLS += vboxmouse_drv_70
- vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_70_DEFS = \
- 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
-@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \
- #
- # vboxmouse_drv_71
- #
--DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
- vboxmouse_drv_71_INCS := \
-@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \
- #
- # vboxmouse_drv_13
- #
--DLLS += vboxmouse_drv_13
- vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_13_INCS := \
-@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \
- #
- # vboxmouse_drv_14
- #
--DLLS += vboxmouse_drv_14
- vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_14_INCS := \
-@@ -126,7 +121,6 @@ endif
- #
- # vboxmouse_drv_15
- #
--DLLS += vboxmouse_drv_15
- vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_15_INCS := \
-@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \
- #
- # vboxmouse_drv_16
- #
--DLLS += vboxmouse_drv_16
- vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_16_INCS := \
-@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \
- #
- # vboxmouse_drv_17
- #
--DLLS += vboxmouse_drv_17
- vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \
- #
- # vboxmouse_drv_18
- #
--DLLS += vboxmouse_drv_18
- vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \
- #
- # vboxmouse_drv_19
- #
--DLLS += vboxmouse_drv_19
- vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \
- #
- # vboxmouse_drv_110
- #
--DLLS += vboxmouse_drv_110
- vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \
- 	vboxmouse_15.c
- 
- 
-+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
-+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
-+	/usr/include/x11 \
-+	/usr/include/xorg \
-+	/usr/include/pixman-1
-+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols.  Not very elegant, but it will catch problems early.
- ifdef VBOX_WITH_TESTCASES
-diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -22,7 +22,6 @@ include	$(KBUILD_PATH)/subheader.kmk
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif   # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -89,7 +88,6 @@ endif   # target linux
- #         base keywords instead of using .solaris or .linux.
- #         Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
-  vboxvideo_drv_70_CFLAGS += \
-@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES  = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
-@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES  = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
-@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
-@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES  = $(vboxvideo_drv_13_SOURCES)
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
-@@ -192,7 +186,6 @@ endif
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_17
- #
--DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_110
- #
--DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \
- vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
- 
- 
-+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
-+	/usr/include/xorg \
-+	/usr/include/x11 \
-+	/usr/include/pixman-1 \
-+	/usr/include/X11/dri \
-+	/usr/include/drm \
-+	/usr/include/libdrm
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
-+
-+# required for lenny backports
-+ifeq ($(XSERVER_VERSION),14)
-+	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
-+endif
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols.  Not very elegant, but it will catch problems early.
- ifdef VBOX_WITH_TESTCASES
diff --git a/community/virtualbox/60-vboxguest.rules b/community/virtualbox/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/community/virtualbox/60-vboxguest.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/community/virtualbox/virtualbox-4-makeself-check.patch b/community/virtualbox/virtualbox-4-makeself-check.patch
deleted file mode 100644
index e1fcb8c2f..000000000
--- a/community/virtualbox/virtualbox-4-makeself-check.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- VirtualBox-4.0.0_OSE/configure
-+++ VirtualBox-4.0.0_OSE/configure
-@@ -2527,7 +2527,6 @@
-   check_compiler_h
-   [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
-   # tools/common/makeself*
--  [ $OSE -ge 1 ] && check_makeself
- fi
- 
- [ -n "$SETUP_WINE" ] && setup_wine
diff --git a/community/virtualbox/virtualbox-4-mkisofs-check.patch b/community/virtualbox/virtualbox-4-mkisofs-check.patch
deleted file mode 100644
index 8b0d59123..000000000
--- a/community/virtualbox/virtualbox-4-mkisofs-check.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- VirtualBox-4.0.0_OSE/configure
-+++ VirtualBox-4.0.0_OSE/configure
-@@ -2499,7 +2499,6 @@
- # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
- # [ "$OS" != "darwin" ] && check_yasm
- [ "$OS" != "darwin"  ] && check_xsltproc
--[ "$OS" != "darwin"  ] && check_mkisofs
- 
- # the libraries
- [ "$OS" != "darwin"  ] && check_pthread
diff --git a/community/virtualbox/virtualbox-archlinux-modules.install b/community/virtualbox/virtualbox-archlinux-modules.install
deleted file mode 100644
index 40e979b05..000000000
--- a/community/virtualbox/virtualbox-archlinux-modules.install
+++ /dev/null
@@ -1,24 +0,0 @@
-KERNEL_VERSION='3.0-ARCH'
-
-post_install() {
-  cat << EOM
-
-===> virtualbox-archlinux-modules post-install message:
-===>
-===> You may want to load vboxguest, vboxsf and vboxvideo
-===>
-===> To load them automatically, add them
-===> to the MODULES array in /etc/rc.conf.
-
-EOM
-
-  depmod -v $KERNEL_VERSION >/dev/null 2>&1
-}
-
-post_remove() {
-  depmod -v $KERNEL_VERSION >/dev/null 2>&1
-}
-
-post_upgrade() {
-  depmod -v $KERNEL_VERSION >/dev/null 2>&1
-}
diff --git a/community/widelands-data/PKGBUILD b/community/widelands-data/PKGBUILD
deleted file mode 100644
index e83fd4754..000000000
--- a/community/widelands-data/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 57510 2011-10-29 20:40:01Z lcarlier $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands-data
-pkgver=16
-_realver=build16
-pkgrel=1
-pkgdesc="Widelands data files"
-arch=('any')
-url="http://widelands.org/"
-license=('GPL')
-makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
-source=(http://launchpad.net/widelands/build16/$_realver/+download/widelands-$_realver-src.tar.bz2)
-md5sums=('3d8c28e145b73c64d8ed1625319d25a2')
-
-build() {
-    cd $srcdir/widelands-$_realver-src
-
-    mkdir -p build/compile && cd build/compile
-
-    cmake ../.. -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_DATADIR=share/widelands \
-        -DWL_INSTALL_BINDIR=bin
-    make
-}
-
-package() {
-    cd $srcdir/widelands-$_realver-src/build/compile
-
-    make DESTDIR="$pkgdir" install
-
-    rm -r "$pkgdir"/usr/{bin,share/widelands/{ChangeLog,COPYING,CREDITS,VERSION}}
-}
diff --git a/core/bin86/PKGBUILD b/core/bin86/PKGBUILD
deleted file mode 100644
index c3865a24e..000000000
--- a/core/bin86/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 119692 2011-04-13 17:22:23Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=bin86
-pkgver=0.16.18
-pkgrel=1
-pkgdesc="A complete 8086 assembler and loader"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.debath.co.uk/"
-depends=('glibc')
-source=(http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz
-	bin86-0.16.17-x86_64-1.patch)
-md5sums=('914068fb649b93642d1cf21857b75699'
-         '92bdce7b0655cd2e9f83c83fc56d128e')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  if [ "$CARCH" = "x86_64" ]; then
-     patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch
-  fi
-  make PREFIX=/usr
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
-  make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install
-}
diff --git a/core/bin86/bin86-0.16.17-x86_64-1.patch b/core/bin86/bin86-0.16.17-x86_64-1.patch
deleted file mode 100644
index 152413ee7..000000000
--- a/core/bin86/bin86-0.16.17-x86_64-1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net>
-Date: 2005-06-28
-Initial Package Version: 0.16.14
-Upstream Status: Submitted Upstream
-Origin: from ROCK Linux
-Description: Allows bin86 to compile on x86_64, which permits lilo to
- be used in a 64-bit system.  I'm dubious about ROCK's attempts to
- automatically add dual-licensing to all their patches, but bin86 is
- already GPL'd.  I've heard from the maintainer that this will be
- included in the next upload.
-
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
---- bin86-0.16.14-orig/ld/x86_aout.h	2004-11-07 20:07:31.506442000 +0100
-+++ bin86-0.16.14/ld/x86_aout.h	2004-11-07 20:07:41.106982496 +0100
-@@ -12,6 +12,9 @@
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
- #define __OUT_OK 1
-+#elif defined(__x86_64__)
-+typedef int Long;
-+#define __OUT_OK 1
- #else
- typedef char Long[4];
- #endif
diff --git a/core/ed/ed.install b/core/ed/ed.install
deleted file mode 100644
index 637807f96..000000000
--- a/core/ed/ed.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(ed.info red.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/core/mpfr/mpfr-3.1.0.p1.patch b/core/mpfr/mpfr-3.1.0.p1.patch
deleted file mode 100644
index 437b1a278..000000000
--- a/core/mpfr/mpfr-3.1.0.p1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-@@ -988,10 +988,11 @@
-  ******************************************************/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0"
-+#define MPFR_VERSION_STRING "3.1.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0";
-+  return "3.1.0-p1";
- }
diff --git a/extra/gnome-settings-daemon/upower.patch b/extra/gnome-settings-daemon/upower.patch
deleted file mode 100644
index 36dad59e3..000000000
--- a/extra/gnome-settings-daemon/upower.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u -r gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c	2011-10-20 08:19:31.818642262 +0200
-+++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c	2011-10-20 08:23:55.127492221 +0200
-@@ -2066,15 +2066,15 @@
-                           (GAsyncReadyCallback) power_keyboard_ready_cb,
-                           manager);
- 
--        g_dbus_proxy_new (manager->priv->connection,
--                          G_DBUS_PROXY_FLAGS_NONE,
--                          NULL,
--                          "org.freedesktop.UPower",
--                          "/org/freedesktop/UPower",
--                          "org.freedesktop.UPower",
--                          NULL,
--                          (GAsyncReadyCallback) upower_ready_cb,
--                          manager);
-+        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-+                                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-+                                  NULL,
-+                                  "org.freedesktop.UPower",
-+                                  "/org/freedesktop/UPower",
-+                                  "org.freedesktop.UPower",
-+                                  NULL,
-+                                  (GAsyncReadyCallback) upower_ready_cb,
-+                                  manager);
- }
- 
- static void
diff --git a/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch b/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch
deleted file mode 100644
index 56bd529c2..000000000
--- a/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Shawn Bohrer <sbohrer@rgmadvisors.com>
-
-Only count directories that match /sys/devices/system/cpu/cpu[0-9]+ as
-CPUs.  Previously any directory that started with cpu was counted which
-caused cpufreq and cpuidle to be counted as CPUs.
-
-Signed-off-by: Shawn Bohrer <sbohrer@rgmadvisors.com>
----
- cputree.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/cputree.c b/cputree.c
-index 3b0c982..b879785 100644
---- a/cputree.c
-+++ b/cputree.c
-@@ -25,6 +25,7 @@
-  */
- 
- #include "config.h"
-+#include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -321,7 +322,7 @@ void parse_cpu_tree(void)
- 		return;
- 	do {
- 		entry = readdir(dir);
--                if (entry && strlen(entry->d_name)>3 && strstr(entry->d_name,"cpu")) {
-+                if (entry && !strncmp(entry->d_name,"cpu", 3) && isdigit(entry->d_name[3])) {
- 			char new_path[PATH_MAX];
- 			sprintf(new_path, "/sys/devices/system/cpu/%s", entry->d_name);
- 			do_one_cpu(new_path);
--- 
-1.6.5.2
-
diff --git a/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch b/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch
deleted file mode 100644
index c2e69c218..000000000
--- a/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Shawn Bohrer <sbohrer@rgmadvisors.com>
-
-Special interrupt counts line NMI may start with a space
-
-The kernel determines the maximum number of possible IRQs and pads the
-first field of /proc/interrupts appropriately.  With four or more digits
-of precession the special interrupt counts all start with a space
-instead of a letter.  This caused the special interrupt counts to be
-counted on my system and that caused the cpunr count to be off when it
-reached the ERR and MIS lines forcing a CPU rescan.
-
-Signed-off-by: Shawn Bohrer <sbohrer@rgmadvisors.com>
----
- procinterrupts.c |   24 +++++++++++-------------
- 1 files changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/procinterrupts.c b/procinterrupts.c
-index e336efe..322f4de 100644
---- a/procinterrupts.c
-+++ b/procinterrupts.c
-@@ -55,20 +55,18 @@ void parse_proc_interrupts(void)
- 		if (getline(&line, &size, file)==0)
- 			break;
- 
--
-+		number = strtoul(line, &c, 10);
- 		/* lines with letters in front are special, like NMI count. Ignore */
--		if (!(line[0]==' ' || (line[0]>='0' && line[0]<='9')))
--			break;
--		c = strchr(line, ':');
--		if (!c)
-+		if (line == c)
-+			continue;
-+
-+		if (c[0] == ':')
-+			++c;
-+		else
- 			continue;
--		*c = 0;
--		c++;
--		number = strtoul(line, NULL, 10);
-+
- 		count = 0;
- 		cpunr = 0;
--
--		c2=NULL;
- 		while (1) {
- 			uint64_t C;
- 			C = strtoull(c, &c2, 10);
-@@ -78,11 +76,11 @@ void parse_proc_interrupts(void)
- 			c=c2;
- 			cpunr++;
- 		}
--		if (cpunr != core_count) 
-+		if (cpunr != core_count)
- 			need_cpu_rescan = 1;
--		
-+
- 		set_interrupt_count(number, count);
--	}		
-+	}
- 	fclose(file);
- 	free(line);
- }
--- 
-1.6.5.2
-
diff --git a/extra/irqbalance/current-trunk.patch b/extra/irqbalance/current-trunk.patch
deleted file mode 100644
index 83f08575c..000000000
--- a/extra/irqbalance/current-trunk.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-Index: powermode.c
-===================================================================
---- powermode.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ powermode.c	(.../trunk)	(revision 33)
-@@ -40,7 +40,8 @@
- 	char *line = NULL;
- 	size_t size = 0;
- 	char *c;
--	uint64_t dummy, irq, softirq;
-+	uint64_t dummy __attribute__((unused));
-+	uint64_t irq, softirq;
- 	file = fopen("/proc/stat", "r");
- 	if (!file)
- 		return;
-Index: cputree.c
-===================================================================
---- cputree.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ cputree.c	(.../trunk)	(revision 33)
-@@ -47,6 +47,7 @@
- /* Users want to be able to keep interrupts away from some cpus; store these in a cpumask_t */
- cpumask_t banned_cpus;
- 
-+cpumask_t cpu_possible_map;
- 
- /* 
-    it's convenient to have the complement of banned_cpus available so that 
-@@ -158,6 +159,8 @@
- 	memset(cpu, 0, sizeof(struct cpu_core));
- 
- 	cpu->number = strtoul(&path[27], NULL, 10);
-+
-+	cpu_set(cpu->number, cpu_possible_map);
- 	
- 	cpu_set(cpu->number, cpu->mask);
- 
-@@ -219,15 +222,15 @@
- 	core_count++;
- }
- 
--static void dump_irqs(int spaces, GList *interrupts)
-+static void dump_irqs(int spaces, GList *dump_interrupts)
- {
- 	struct interrupt *irq;
--	while (interrupts) {
-+	while (dump_interrupts) {
- 		int i;
--		for (i=0; i<spaces;i++) printf(" ");
--		irq = interrupts->data;
-+		for (i=0; i<spaces; i++) printf(" ");
-+		irq = dump_interrupts->data;
- 		printf("Interrupt %i (%s/%u) \n", irq->number, classes[irq->class], (unsigned int)irq->workload);
--		interrupts = g_list_next(interrupts);
-+		dump_interrupts = g_list_next(dump_interrupts);
- 	}
- }
- 
-Index: placement.c
-===================================================================
---- placement.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ placement.c	(.../trunk)	(revision 33)
-@@ -272,7 +272,7 @@
- 		}
- 		if ((!cpus_empty(irq->node_mask)) &&
- 		    (!cpus_equal(irq->mask, irq->node_mask)) &&
--		    (!cpus_full(irq->node_mask))) {
-+		    (!__cpus_full(&irq->node_mask, num_possible_cpus()))) {
- 			irq->old_mask = irq->mask;
- 			irq->mask = irq->node_mask;
- 		}
-Index: cpumask.h
-===================================================================
---- cpumask.h	(.../tags/irqbalance-0.56)	(revision 33)
-+++ cpumask.h	(.../trunk)	(revision 33)
-@@ -1,7 +1,7 @@
- #ifndef __LINUX_CPUMASK_H
- #define __LINUX_CPUMASK_H
- 
--#define NR_CPUS 256
-+#define NR_CPUS 4096
- /*
-  * Cpumasks provide a bitmap suitable for representing the
-  * set of CPU's in a system, one bit position per CPU number.
-Index: bitmap.c
-===================================================================
---- bitmap.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ bitmap.c	(.../trunk)	(revision 33)
-@@ -74,6 +74,19 @@
- 	return 1;
- }
- 
-+int __bitmap_weight(const unsigned long *bitmap, int bits)
-+{
-+	int k, w = 0, lim = bits/BITS_PER_LONG;
-+
-+	for (k = 0; k < lim; k++)
-+		w += hweight_long(bitmap[k]);
-+
-+	if (bits % BITS_PER_LONG)
-+		w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
-+
-+	return w;
-+}
-+
- int __bitmap_equal(const unsigned long *bitmap1,
- 		const unsigned long *bitmap2, int bits)
- {
-Index: irqlist.c
-===================================================================
---- irqlist.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ irqlist.c	(.../trunk)	(revision 33)
-@@ -28,6 +28,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- 
- #include "types.h"
- #include "irqbalance.h"
-@@ -39,6 +40,7 @@
- void get_affinity_hint(struct interrupt *irq, int number)
- {
- 	char buf[PATH_MAX];
-+	cpumask_t tempmask;
- 	char *line = NULL;
- 	size_t size = 0;
- 	FILE *file;
-@@ -51,7 +53,9 @@
- 		fclose(file);
- 		return;
- 	}
--	cpumask_parse_user(line, strlen(line), irq->node_mask);
-+	cpumask_parse_user(line, strlen(line), tempmask);
-+	if (!__cpus_full(&tempmask, num_possible_cpus()))
-+		irq->node_mask = tempmask;
- 	fclose(file);
- 	free(line);
- }
-@@ -64,7 +68,7 @@
- 	DIR *dir;
- 	struct dirent *entry;
- 	char *c, *c2;
--	int nr , count = 0;
-+	int nr , count = 0, can_set = 1;
- 	char buf[PATH_MAX];
- 	sprintf(buf, "/proc/irq/%i", number);
- 	dir = opendir(buf);
-@@ -77,7 +81,7 @@
- 			size_t size = 0;
- 			FILE *file;
- 			sprintf(buf, "/proc/irq/%i/smp_affinity", number);
--			file = fopen(buf, "r");
-+			file = fopen(buf, "r+");
- 			if (!file)
- 				continue;
- 			if (getline(&line, &size, file)==0) {
-@@ -86,7 +90,13 @@
- 				continue;
- 			}
- 			cpumask_parse_user(line, strlen(line), irq->mask);
--			fclose(file);
-+			/*
-+			 * Check that we can write the affinity, if
-+			 * not take it out of the list.
-+			 */
-+			fputs(line, file);
-+			if (fclose(file) && errno == EIO)
-+				can_set = 0;
- 			free(line);
- 		} else if (strcmp(entry->d_name,"allowed_affinity")==0) {
- 			char *line = NULL;
-@@ -119,7 +129,7 @@
- 			count++;
- 
- 	/* if there is no choice in the allowed mask, don't bother to balance */
--	if (count<2)
-+	if ((count<2) || (can_set == 0))
- 		 irq->balance_level = BALANCE_NONE;
- 		
- 
-Index: Makefile.am
-===================================================================
---- Makefile.am	(.../tags/irqbalance-0.56)	(revision 33)
-+++ Makefile.am	(.../trunk)	(revision 33)
-@@ -21,7 +21,7 @@
- # 
- 
- AUTOMAKE_OPTIONS = no-dependencies
--EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4
-+EXTRA_DIST = README INSTALL COPYING autogen.sh cap-ng.m4
-  
- INCLUDES = -I${top_srcdir} 
- LIBS = $(CAPNG_LDADD) $(GLIB_LIBS)
-@@ -31,6 +31,7 @@
- sbin_PROGRAMS = irqbalance
- irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \
- 	irqlist.c network.c numa.c placement.c powermode.c procinterrupts.c
-+dist_man_MANS = irqbalance.1
- 
- CONFIG_CLEAN_FILES = debug*.list config/*
- clean-generic:
-Index: network.c
-===================================================================
---- network.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ network.c	(.../trunk)	(revision 33)
-@@ -160,10 +160,8 @@
- 	}
- 
- 	while (!feof(file)) {
--		uint64_t rxcount;
--		uint64_t txcount;
--		uint64_t delta;
--		int dummy;
-+		uint64_t dummy __attribute__((unused));
-+		uint64_t rxcount, txcount, delta;
- 		char *c, *c2;
- 		if (getline(&line, &size, file)==0)
- 			break;
diff --git a/extra/k3b/fix-crash-with-qt-4.7.0.patch b/extra/k3b/fix-crash-with-qt-4.7.0.patch
deleted file mode 100644
index a99b5c639..000000000
--- a/extra/k3b/fix-crash-with-qt-4.7.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: src/option/k3bpluginoptiontab.cpp
-===================================================================
---- src/option/k3bpluginoptiontab.cpp	(revision 1168967)
-+++ src/option/k3bpluginoptiontab.cpp	(working copy)
-@@ -43,12 +43,28 @@
-     layout->addWidget( label );
-     layout->addWidget( pluginSelector );
- 
-+    // find all categories
-+    QHash<QString, QString> categoryNames;
-+
-     foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
--        kDebug() << "Adding plugin" << plugin->pluginInfo().name();
--        pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(),
-+        categoryNames[ plugin->category() ] = plugin->categoryName();
-+    }
-+
-+    // add all plugins in each category
-+    foreach( const QString &category, categoryNames.keys() ) {
-+        QList<KPluginInfo> plugins;
-+
-+        foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
-+            if ( plugin->category() == category ) {
-+                plugins << plugin->pluginInfo();
-+                kDebug() << "Adding plugin" << plugin->pluginInfo().name();
-+            }
-+        }
-+        pluginSelector->addPlugins( plugins,
-                                     KPluginSelector::ReadConfigFile,
--                                    plugin->categoryName(),
--                                    plugin->category() );
-+                                    categoryNames[ category ],
-+                                    category
-+                                  );
-     }
- }
- 
diff --git a/extra/kdelibs/kdelibs-nepomuk-unicode.diff b/extra/kdelibs/kdelibs-nepomuk-unicode.diff
deleted file mode 100644
index 1c85d6fc9..000000000
--- a/extra/kdelibs/kdelibs-nepomuk-unicode.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
-index 055482e..3880e13 100644
---- a/nepomuk/query/querybuilderdata_p.h
-+++ b/nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
- 
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+    QStringList newTerms;
-+    foreach(const QString& term, terms) {
-+        int i = 0;
-+        while(i < term.length()) {
-+            if(term[i].unicode() > 0x7f) {
-+                break;
-+            }
-+            ++i;
-+        }
-+        if(i > 0) {
-+            newTerms.append(term.left(i));
-+        }
-+    }
-+    return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
-     namespace Query {
-         class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
-                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
-                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
-                         const QString& varName = it.key();
--                        const QStringList& terms = it.value();
--                        // bif:search_excerpt wants a vector of all search terms
--                        excerptParts
--                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
--                            .arg( terms.join(QLatin1String("','")),
--                                  varName );
-+                        const QStringList terms = stripExtendedCharsHack(it.value());
-+                        if(terms.count()) {
-+                            // bif:search_excerpt wants a vector of all search terms
-+                            excerptParts
-+                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+                                       .arg( terms.join(QLatin1String("','")),
-+                                             varName );
-+                        }
-                     }
- 
--                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
--                        .arg(excerptParts.join(QLatin1String(",")));
-+                    if(excerptParts.count()) {
-+                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+                                .arg(excerptParts.join(QLatin1String(",")));
-+                    }
-+                    else {
-+                        return QString();
-+                    }
-                 }
-                 else {
-                     return QString();
-\ No newline at end of file
diff --git a/extra/kdepim-runtime/smi0.91.patch b/extra/kdepim-runtime/smi0.91.patch
deleted file mode 100644
index 2229f9cd1..000000000
--- a/extra/kdepim-runtime/smi0.91.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdepim-runtime-4.7.2/plugins/akonadi_serializer_addressee.desktop~	2011-10-12 10:05:55.432618174 +0000
-+++ kdepim-runtime-4.7.2/plugins/akonadi_serializer_addressee.desktop	2011-10-12 10:06:06.586046531 +0000
-@@ -89,7 +89,7 @@
- Comment[zh_TW]=地址物件的 Akonadi 序列器外掛程式
- 
- [Plugin]
--Type=text/vcard,text/directory
-+Type=text/vcard
- X-Akonadi-Class=legacy;default;KABC::Addressee;
- X-KDE-Library=akonadi_serializer_addressee
- X-KDE-ClassName=Akonadi::SerializerPluginAddressee
diff --git a/extra/kdeutils/CVE-2011-2725.patch b/extra/kdeutils/CVE-2011-2725.patch
deleted file mode 100644
index 986bebc90..000000000
--- a/extra/kdeutils/CVE-2011-2725.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/part/part.cpp
-+++ b/part/part.cpp
-@@ -558,8 +558,15 @@ void Part::slotPreviewExtracted(KJob *jo
-     if (!job->error()) {
-         const ArchiveEntry& entry =
-             m_model->entryForIndex(m_view->selectionModel()->currentIndex());
--        const QString fullName =
--            m_previewDir->name() + QLatin1Char( '/' ) + entry[ FileName ].toString();
-+
-+        QString fullName =
-+            m_previewDir->name() + QLatin1Char('/') + entry[FileName].toString();
-+
-+        // Make sure a maliciously crafted archive with parent folders named ".." do
-+        // not cause the previewed file path to be located outside the temporary
-+        // directory, resulting in a directory traversal issue.
-+        fullName.remove(QLatin1String("../"));
-+
-         ArkViewer::view(fullName, widget());
-     } else {
-         KMessageBox::error(widget(), job->errorString());
diff --git a/extra/libmsn/openssl1.patch b/extra/libmsn/openssl1.patch
deleted file mode 100644
index 0ff7de898..000000000
--- a/extra/libmsn/openssl1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libmsn-4.1/msntest/msntest.cpp~	2010-04-01 15:05:13.248056050 +0200
-+++ libmsn-4.1/msntest/msntest.cpp	2010-04-01 15:07:18.938878993 +0200
-@@ -259,7 +259,13 @@
-                     if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected)
-                     {
-                         BIO *bio_socket_new;
--                        SSL_METHOD *meth=NULL;
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+			const SSL_METHOD *meth=NULL;
-+#else
-+			SSL_METHOD *meth=NULL;
-+#endif
-+
-                         meth=SSLv23_client_method();
-                         SSLeay_add_ssl_algorithms();
-                         mySocketsSsl[i].ctx = SSL_CTX_new(meth);
diff --git a/extra/ntp/changelog b/extra/ntp/changelog
deleted file mode 100644
index 528a07826..000000000
--- a/extra/ntp/changelog
+++ /dev/null
@@ -1,25 +0,0 @@
-2011-04-03  andrea <andrea@archlinux.org>
-
-    * ntp 4.2.6p3-3
-    - Use 'ntpd -p' to get the PID in ntpd
-    - Don't run the ntp client in background in ntpdate
-
-2011-03-28  andrea <andrea@archlinux.org>
-
-    * ntp 4.2.6p3-2
-    - Improved daemon scripts
-
-2010-10-16  kevin  <kevin@archlinux.org>
-
-    * ntp 4.2.6p3
-    - Implemented FS#18469, replace ntpdate with ntpd -q
-    - Removed LIBS
-    - Removed old IPv6 and nano patch
-
-2010-10-16  kevin  <kevin@archlinux.org>
-
-    * ntp 4.2.6p2
-    - Added changelog
-    - Set LIBS to use librt since configure doesn't set it
-    - Convert PKGBUILD to build()/package() format
-    - removed "|| return 1"
diff --git a/extra/ntp/ntp-4.2.4-html2man.patch b/extra/ntp/ntp-4.2.4-html2man.patch
deleted file mode 100644
index 333d4529a..000000000
--- a/extra/ntp/ntp-4.2.4-html2man.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- ntp-4.2.4/scripts/html2man.in.html2man	2006-06-06 22:17:10.000000000 +0200
-+++ ntp-4.2.4/scripts/html2man.in	2007-01-08 12:47:31.000000000 +0100
-@@ -23,10 +23,10 @@
- 	     'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'],
- 	     'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
- 	     'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
--	     'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'],
-+	     'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
- 	     'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
- 	     'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
--	     'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
-+	     'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
- 	     'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
- 	     'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'],
- 	     'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'],
-@@ -34,17 +34,8 @@
- 	     'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']);
- 
- # Disclaimer to go in SEE ALSO section of the man page
--$seealso_disclaimer = 'These man pages are automatically hacked from the main NTP ' .
--    'documentation pages, which are maintained in HTML format.  These files are ' .
--    'included in the NTP source distribution.  If you installed NTP from a binary ' .
--    'package, or it came pre-installed on your system, chances are the documentation ' .
--    'was also included in the usual place for your system.  The HTML files are more ' .
--    'correct and complete than these man pages, which are provided for your reference ' .
--    'only.';
--
--# Disclaimer to go right at the top
--$top_disclaimer = 'This file was automatically generated from HTML source, and may be ' .
--    'incorrect.  See the SEE ALSO section at the end of this file for more info';
-+$seealso_disclaimer = "Primary source of documentation: /usr/share/doc/ntp-*\n\n" .
-+    "This file was automatically generated from HTML source.\n";
- 
- mkdir $MANDIR, 0777;
- mkdir "$MANDIR/man8", 0777;
-@@ -64,7 +55,8 @@
-     $fileinfo = $manfiles{$filename};
- 
-     $p = HTML::TokeParser->new("$filename.html") || die "Can't open $filename.html: $!";
--    open(MANOUT, ">$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]")
-+    $fileout = "$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]";
-+    open(MANOUT, ">$fileout")
- 	|| die "Can't open: $!";
- 
-     $p->get_tag("title");
-@@ -73,7 +65,6 @@
- 
-     # Setup man header
-     print MANOUT ".TH " . $fileinfo->[0] . " " . $fileinfo->[1] .  "\n";
--    print MANOUT ".UC 4\n";
-     print MANOUT ".SH NAME\n";
-     $pat = $fileinfo->[0];
-     if ($name =~ /$pat/) {
-@@ -81,10 +72,12 @@
- 	# Add the manpage name, if not in the HTML title already
- 	print MANOUT "$fileinfo->[0] - ";
-     }
--    print MANOUT "$name\n\n";
--
--    print MANOUT "$top_disclaimer\n";
-+    print MANOUT "$name\n.SH \\ \n\n";
- 
-+    @fontstack = ();
-+    $deflevel = 0;
-+    $pre = 0;
-+    $ignore = 0;
-     # Now start scanning.  We basically print everything after translating some tags.
-     # $token->[0] has "T", "S", "E" for Text, Start, End
-     # $token->[1] has the tag name, or text (for "T" case)
-@@ -92,19 +85,37 @@
-     while (my $token = $p->get_token) {
- 	if($token->[0] eq "T") {
- 	    my $text = $token->[1];
--	    if($tag) {
--		$text =~ s/^[\n ]*//;
--		$text =~ s/[\n ]*$/ /;
-+	    if (!$pre) {
-+		if($tag) {
-+		    $text =~ s/^[\n\t ]*//;
-+		}
-+		$text =~ s/^[\n\t ][\n\t ]+$//;
-+		$text =~ s/[\n\t ]+/ /g;
-+		$text =~ s/&nbsp\;/ /g;
-+		$text =~ s/&gt\;/>/g;
-+		$text =~ s/&lt\;/</g;
-+		$text =~ s/&quot\;/"/g;
-+		$text =~ s/&amp\;/&/g;
-+		$text =~ s/^\./\\[char46]/;
- 	    }
--	    $text =~ s/&nbsp\;/ /g;
--	    $text =~ s/^\./\\./;
- 	    print MANOUT "$text";
- 	    $tag = 0;
- 	}
- 	if($token->[0] eq "S") {
- 	    if($token->[1] eq "h4") {
- 		my $text = uc($p->get_trimmed_text("/h4"));
--		print MANOUT ".SH $text\n";
-+		# ignore these two sections in ntpd.html
-+		if ($filename eq "ntpd" &&
-+		    ($text eq "FILES" || $text eq "CONFIGURATION OPTIONS")) {
-+			$ignore = 1;
-+			close(MANOUT);
-+			open(MANOUT, ">/dev/null");
-+		} elsif ($ignore) {
-+		    $ignore = 0;
-+		    close(MANOUT);
-+		    open(MANOUT, ">>$fileout");
-+		}
-+		print MANOUT "\n\n.SH $text\n";
- 	    }
- 	    if($token->[1] eq "tt") {
- 		push @fontstack, "tt";
-@@ -118,22 +129,30 @@
- 		my $text = $p->get_trimmed_text("/address");
- 		print MANOUT "\n.SH AUTHOR\n$text\n";
- 	    }
--	    if($token->[1] eq "dt") {
--		$tmp = $deflevel-4;
--		print MANOUT "\n.RS $tmp\n";
-+	    if($token->[1] eq "dt" || $token->[1] eq "br" && $deflevel > 0) {
-+		print MANOUT "\n.TP 8\n";
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "dd") {
--		print MANOUT "\n.RS $deflevel\n";
-+		print MANOUT "\n";
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "dl") {
--		$deflevel+=4;
-+		$deflevel+=1;
-+		if ($deflevel > 0) {
-+		    print MANOUT "\n.RS ", $deflevel > 1 ? 8 : 0;
-+		}
-+	    }
-+	    if($token->[1] eq "p") {
-+		print MANOUT "\n";
-+	    }
-+	    if($token->[1] eq "pre") {
-+		print MANOUT "\n.nf";
-+		$pre = 1;
- 	    }
- 	}
- 	elsif($token->[0] eq "E") {
--	    if($token->[1] eq "dd") {
--		print MANOUT "\n.RE\n";
-+	    if($token->[1] eq "h4") {
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "tt") {
-@@ -157,15 +176,27 @@
- 		print MANOUT "$fontswitch";
- 	    }
- 	    if($token->[1] eq "dl") {
--		$deflevel-=4;
-+		if ($deflevel > 0) {
-+		    print MANOUT "\n.RE";
-+		}
-+		print MANOUT "\n";
-+		$deflevel-=1;
- 	    }
--	    if($token->[1] eq "dt") {
--		print MANOUT "\n.RE";
-+	    if($token->[1] eq "p") {
-+		print MANOUT "\n";
- 		$tag = 1;
- 	    }
-+	    if($token->[1] eq "pre") {
-+		print MANOUT "\n.fi";
-+		$pre = 0;
-+	    }
- 	}
-     }
--    print MANOUT ".SH SEE ALSO\n\n";
-+    if ($ignore) {
-+	close(MANOUT);
-+	open(MANOUT, ">>$fileout");
-+    }
-+    print MANOUT "\n.SH SEE ALSO\n\n";
-     print MANOUT "$fileinfo->[2]\n\n";
-     print MANOUT "$seealso_disclaimer\n";
-     close(MANOUT);
diff --git a/extra/ntp/ntp-client.conf b/extra/ntp/ntp-client.conf
deleted file mode 100644
index e728db579..000000000
--- a/extra/ntp/ntp-client.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g"
diff --git a/extra/thunar/org.freedesktop.udisks.pkla b/extra/thunar/org.freedesktop.udisks.pkla
deleted file mode 100644
index 5cc443bd1..000000000
--- a/extra/thunar/org.freedesktop.udisks.pkla
+++ /dev/null
@@ -1,7 +0,0 @@
-[Local Users]
-#Identity=unix-user: your_username
-Identity=unix-group:storage
-Action=org.freedesktop.udisks.*
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/extra/virtuoso/fix-unicode.patch b/extra/virtuoso/fix-unicode.patch
deleted file mode 100644
index 30046d233..000000000
--- a/extra/virtuoso/fix-unicode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libsrc/Wi/xqf.c
-===================================================================
-RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v
-retrieving revision 1.21.2.9
-retrieving revision 1.21.2.12
-diff -u -r1.21.2.9 -r1.21.2.12
---- libsrc/Wi/xqf.c	3 Mar 2011 11:56:45 -0000	1.21.2.9
-+++ libsrc/Wi/xqf.c	26 Aug 2011 19:34:56 -0000	1.21.2.12
-@@ -3520,6 +3552,12 @@
-   desc = xqf_str_parser_descs + desc_idx;
-   if (DV_DB_NULL == arg_dtp)
-     return NEW_DB_NULL;
-+  /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
-+  if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
-+    {
-+      res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
-+      goto res_ready;
-+    }
-   if (DV_STRING != arg_dtp)
-     {
-       caddr_t err = NULL;
diff --git a/extra/xfce4-session/org.freedesktop.consolekit.pkla b/extra/xfce4-session/org.freedesktop.consolekit.pkla
deleted file mode 100644
index 7f1d74ff6..000000000
--- a/extra/xfce4-session/org.freedesktop.consolekit.pkla
+++ /dev/null
@@ -1,31 +0,0 @@
-[Local restart]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local restart - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/extra/xfce4-session/org.freedesktop.upower.pkla b/extra/xfce4-session/org.freedesktop.upower.pkla
deleted file mode 100644
index 52c74f892..000000000
--- a/extra/xfce4-session/org.freedesktop.upower.pkla
+++ /dev/null
@@ -1,15 +0,0 @@
-[Local hibernate]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.hibernate
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local suspend]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.suspend
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch b/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch
deleted file mode 100644
index c23e8ec78..000000000
--- a/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b1922538b26f9929bcd43df8728bf33afe06fbef Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Thu, 27 Jan 2011 22:29:16 +0100
-Subject: [PATCH] Fix problems with plugin and 4.8 panel.
-
----
- configure.ac                    |    2 +-
- src/smartbookmark.desktop.in.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1ba88d4..cb344f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW])
- dnl Check for required packages
- XDT_CHECK_LIBX11_REQUIRE()
- XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
- 
- XDT_FEATURE_DEBUG()
-diff --git a/src/smartbookmark.desktop.in.in b/src/smartbookmark.desktop.in.in
-index 83464ff..7bafece 100644
---- a/src/smartbookmark.desktop.in.in
-+++ b/src/smartbookmark.desktop.in.in
-@@ -4,5 +4,5 @@ Encoding=UTF-8
- _Name=SmartBookmark
- _Comment=Query websites from the Xfce panel
- Icon=gtk-preferences
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
-+X-XFCE-Module=smartbookmark
- X-XFCE-Unique=false
--- 
-1.7.3.5
-
diff --git a/staging/alsa-plugins/PKGBUILD b/staging/alsa-plugins/PKGBUILD
deleted file mode 100644
index 27bc024c3..000000000
--- a/staging/alsa-plugins/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 141604 2011-10-31 16:09:16Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Daniel Ehlers <danielehlers@mindeye.net>
-
-pkgname=alsa-plugins
-pkgver=1.0.24
-pkgrel=3
-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")
-md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
-}
diff --git a/staging/avidemux/PKGBUILD b/staging/avidemux/PKGBUILD
deleted file mode 100644
index c8edef3f7..000000000
--- a/staging/avidemux/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 141619 2011-10-31 21:13:23Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.5
-pkgrel=5
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
-        avidemux-2.5.4-x264-build115.patch)
-md5sums=('33bbe210c6826cea1987ed18a41d57a7'
-         '24a18b53a58b678b9e87d30566985751')
-
-build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-
-  patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch"
-
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
-  make
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-  mkdir -p lib
-  cd lib
-  find ../avidemux -name '*.so*' | xargs ln -sft .
-  cd ../../plugins
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
-    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
-    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
-    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
-  make
-}
-
-package_avidemux-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faac: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux')
-  conflicts=('avidemux')
-  replaces=('avidemux')
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/avidemux
-  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
-  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
-
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
-
-  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
-
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-}
-
-package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt')
-  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/staging/avidemux/avidemux-2.5.4-x264-build115.patch b/staging/avidemux/avidemux-2.5.4-x264-build115.patch
deleted file mode 100644
index c627667ec..000000000
--- a/staging/avidemux/avidemux-2.5.4-x264-build115.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +0200
-@@ -488,8 +488,10 @@
- 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
- 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
- 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
- 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +0200
-@@ -417,7 +417,7 @@
- 	_param.b_cabac = cabac;
- }
- 
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
- 	return _param.i_open_gop;
-@@ -428,6 +428,17 @@
- 	if (openGopMode < 3)
- 		_param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114
-+unsigned int x264Options::getOpenGopMode(void)
-+{
-+        return _param.b_open_gop;
-+}
-+ 
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+        if (openGopMode < 3)
-+                _param.b_open_gop = openGopMode;
-+}
- #endif
- 
- unsigned int x264Options::getInterlaced(void)
diff --git a/staging/avidemux/avidemux.install b/staging/avidemux/avidemux.install
deleted file mode 100644
index e111ef946..000000000
--- a/staging/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/staging/blender/PKGBUILD b/staging/blender/PKGBUILD
deleted file mode 100644
index e658c2966..000000000
--- a/staging/blender/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id: PKGBUILD 141598 2011-10-31 15:34:24Z pierre $
-# Contributor: John Sowiak <john@archlinux.org>
-# Maintainer: tobias <tobias@archlinux.org>
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.60a
-pkgrel=2
-epoch=3
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' 'libsndfile' 'ffmpeg')
-makedepends=('cmake')
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6')
-else
-  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
-  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=38016
-  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir build
-  cd build
-
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
-
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
-    -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=OFF \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
-    -DWITH_BUILTIN_GLEW:BOOL=OFF \
-    -DWITH_CODEC_FFMPEG:BOOL=ON \
-    -DWITH_CODEC_SNDFILE:BOOL=ON \
-    -DPYTHON_VERSION:STRING=3.2 \
-    -DPYTHON_LIBPATH:STRING=/usr/lib \
-    -DPYTHON_LIBRARY:STRING=python3.2mu \
-    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-    $ENABLESSE2
-
-  make $MAKEFLAGS
-
-  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
-    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
-  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
-  chmod 755 bmake
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="${pkgdir}" install
-  python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
diff --git a/staging/blender/blender.install b/staging/blender/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/staging/blender/blender.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/cmus/PKGBUILD b/staging/cmus/PKGBUILD
deleted file mode 100644
index 811591786..000000000
--- a/staging/cmus/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 141608 2011-10-31 19:08:31Z ibiru $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=cmus
-pkgver=2.4.2
-pkgrel=2
-pkgdesc="A very feature-rich ncurses-based music player"
-arch=('i686' 'x86_64')
-url="http://cmus.sourceforge.net/"
-license=('GPL')
-depends=('ncurses')
-makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug'
-             'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
-optdepends=('alsa-lib: for ALSA output plugin support'
-            'libao: for AO output plugin support'
-            'libpulse: for PulseAudio output plugin support'
-            'ffmpeg: for ffmpeg input plugin support'
-            'libmodplug: for modplug input plugin support'
-            'faad2: for input AAC plugin support'
-            'libmad: for mp3 input plugin support'
-            'libmpcdec: for musepack input plugin support'
-            'wavpack: for wavpack input plugin support'
-            'libvorbis: for vorbis input plugin support'
-            'flac: for flac input plugin support'
-            'libmp4v2: for mp4 input plugin support')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
-md5sums=('f3ed7f14db20344ad7386aef48b98a4c')
-sha1sums=('12573e96e03435eca9b8a4aaeeb13a2da66f40a4')
-
-build() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  ./configure prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus"
-}
diff --git a/staging/evince/PKGBUILD b/staging/evince/PKGBUILD
deleted file mode 100644
index e04df4b77..000000000
--- a/staging/evince/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 142265 2011-11-07 16:00:54Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.2.1
-pkgrel=2
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
-optdepends=('texlive-bin: DVI support')
-groups=('gnome-extra')
-install=evince.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr   --sysconfdir=/etc \
-      --localstatedir=/var    --libexecdir=/usr/lib/evince \
-      --disable-static        --enable-nautilus \
-      --enable-pdf            --enable-tiff \
-      --enable-djvu           --enable-dvi \
-      --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile \
-      --enable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/evince/evince.install b/staging/evince/evince.install
deleted file mode 100644
index 9643a9ba0..000000000
--- a/staging/evince/evince.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall evince
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/ffmpeg/PKGBUILD b/staging/ffmpeg/PKGBUILD
deleted file mode 100644
index d116a29f2..000000000
--- a/staging/ffmpeg/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 141586 2011-10-31 13:57:20Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg
-pkgver=20111030
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
-makedepends=('yasm' 'git')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('414bbe4184530f82368f4a29e3e71b51')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --disable-static
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/gegl/0.1.6-ffmpeg.patch b/staging/gegl/0.1.6-ffmpeg.patch
deleted file mode 100644
index 51fb95d28..000000000
--- a/staging/gegl/0.1.6-ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
---- gegl-0.1.6.old//operations/external/ff-load.c   2011-01-24 19:03:30.000000000 -0300
-+++ gegl-0.1.6/operations/external/ff-load.c    2011-05-04 09:59:48.910379742 -0300
-@@ -69,17 +69,17 @@
- {
-   switch (err)
-     {
--    case AVERROR_NUMEXPECTED:
-+    case AVERROR(EDOM):
-       g_warning ("%s: Incorrect image filename syntax.\n"
-                  "Use '%%d' to specify the image number:\n"
-                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
-                  "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
-                  filename);
-       break;
--    case AVERROR_INVALIDDATA:
-+    case AVERROR(EINVAL):
-       g_warning ("%s: Error while parsing header\n", filename);
-       break;
--    case AVERROR_NOFMT:
-+    case AVERROR(EILSEQ):
-       g_warning ("%s: Unknown format\n", filename);
-       break;
-     default:
-@@ -278,7 +278,7 @@
-       for (i = 0; i< p->ic->nb_streams; i++)
-         {
-           AVCodecContext *c = p->ic->streams[i]->codec;
--          if (c->codec_type == CODEC_TYPE_VIDEO)
-+          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
-             {
-               p->video_st = p->ic->streams[i];
-               p->video_stream = i;
diff --git a/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD
deleted file mode 100644
index 9bade16e0..000000000
--- a/staging/gegl/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141633 2011-11-01 00:51:56Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gegl
-pkgver=0.1.6
-pkgrel=2
-pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
-url="http://www.gegl.org/"
-license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
-makedepends=('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 \
-        0.1.6-ffmpeg.patch)
-sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d'
-          'd62d4987f1c0fc256f5968271fc65cce0cc4c195')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch"
-  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
-    --with-libavformat --with-jasper --disable-docs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/graphite/PKGBUILD b/staging/graphite/PKGBUILD
deleted file mode 100644
index 12cab4e69..000000000
--- a/staging/graphite/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 141287 2011-10-28 05:35:50Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgname=graphite
-pkgver=1.0.3
-pkgrel=1
-epoch=1
-arch=('i686' 'x86_64')
-url="http://graphite.sil.org/"
-pkgdesc='reimplementation of the SIL Graphite text processing engine'
-license=('custom_SIL Dual license')
-depends=('gcc-libs')
-makedepends=('cmake' 'freetype2')
-options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz")
-md5sums=('3bf481ca95109b14435125c0dd1f2217')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
-	-DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}"/build
-  ctest
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="$pkgdir/" install
-
-  # licenses
-  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
-}
diff --git a/staging/graphite/pango-graphite.install b/staging/graphite/pango-graphite.install
deleted file mode 100644
index 46bc44611..000000000
--- a/staging/graphite/pango-graphite.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	usr/bin/pango-querymodules >etc/pango/pango.modules
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-        post_install $1
-}
-
diff --git a/staging/gstreamer0.10-ugly/PKGBUILD b/staging/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index 6209ec3b4..000000000
--- a/staging/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 141590 2011-10-31 14:41:06Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-ugly
-pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.18
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
-md5sums=('04a7009a4efea2844075949c111f5e4d')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
-}
-
-package_gstreamer0.10-ugly() {
-  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.34')
-  
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-ugly-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make -C ext DESTDIR="${pkgdir}" install
-}
diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD
deleted file mode 100644
index 7b946ea78..000000000
--- a/staging/inkscape/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 142259 2011-11-07 12:58:22Z bisson $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.2
-pkgrel=4
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-makedepends=('boost' 'pkg-config' 'intltool')
-depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2'
-         'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('pstoedit: latex formulas'
-            'texlive-core: latex formulas'
-            'python2-numpy: some extensions'
-            'python-lxml: some extensions and filters'
-            'uniconvertor: reading/writing to some proprietary formats')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3')
-
-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
-
-	./configure --prefix=/usr \
-		--with-python \
-		--with-perl \
-		--without-gnome-vfs \
-		--with-xft \
-		--enable-lcms \
-		--enable-poppler-cairo \
-		--disable-dependency-tracking \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/inkscape/install b/staging/inkscape/install
deleted file mode 100644
index 6e803bf1d..000000000
--- a/staging/inkscape/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-	post_install
-}
-
-
-post_remove() {
-	post_install
-}
diff --git a/staging/k3b/PKGBUILD b/staging/k3b/PKGBUILD
deleted file mode 100644
index 785c00f25..000000000
--- a/staging/k3b/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 142017 2011-11-04 04:07:38Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=k3b
-pkgver=2.0.2
-pkgrel=3
-pkgdesc="Feature-rich and easy to handle CD burning application"
-arch=('i686' 'x86_64')
-url="http://k3b.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 
-         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' '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')
-options=('!libtool')
-install=k3b.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        k3b-2.0.2-ffmpeg.patch)
-sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
-          '8120c0e22e6c41ea285ca6060be13723ed91c52b')
-
-build() {
-  cd "${srcdir}"
-  (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch")
-  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/staging/k3b/k3b-2.0.2-ffmpeg.patch b/staging/k3b/k3b-2.0.2-ffmpeg.patch
deleted file mode 100644
index 2878b1edc..000000000
--- a/staging/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/staging/k3b/k3b.install b/staging/k3b/k3b.install
deleted file mode 100644
index 413ad60f7..000000000
--- a/staging/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/staging/kdeaccessibility/PKGBUILD b/staging/kdeaccessibility/PKGBUILD
deleted file mode 100644
index 0ed6c97f6..000000000
--- a/staging/kdeaccessibility/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 141578 2011-10-31 11:33:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-jovie'
-         'kdeaccessibility-kaccessible'
-         'kdeaccessibility-kmag'
-         'kdeaccessibility-kmousetool'
-         'kdeaccessibility-kmouth')
-pkgver=4.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://accessibility.kde.org'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('9695d2b8b6f55266e3f76ebf05543f23857b9520')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeaccessibility-jovie() {
-	pkgdesc='A text to speech application'
-	depends=('kdebase-runtime' 'speech-dispatcher')
-    replaces=('kdeaccessibility-kttsd')
-	install='kdeaccessibility.install'
-	cd $srcdir/build/jovie
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/jovie/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kaccessible() {
-    pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-    depends=('kdebase-runtime' 'speech-dispatcher')
-	install='kdeaccessibility.install'
-    cd $srcdir/build/kaccessible
-    make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmag() {
-	pkgdesc='Screen Magnifier'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmag/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmag
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kmag/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmousetool() {
-	pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmousetool/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmousetool
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kmousetool/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmouth() {
-	pkgdesc='Speech Synthesizer Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmouth/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmouth
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kmouth/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeaccessibility/kdeaccessibility.install b/staging/kdeaccessibility/kdeaccessibility.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeaccessibility/kdeaccessibility.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD
deleted file mode 100644
index 155843a9a..000000000
--- a/staging/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 141521 2011-10-31 03:45:16Z 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.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
-	         'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'syslog-path.patch')
-sha1sums=('b2d6d210bc40e8731a9ae8409673f3d71b57de0a'
-          '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'
-	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=('kdepim-runtime')
-	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-python' 'system-config-printer-common' 'python2-pyqt')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/system-config-printer-kde
-	make DESTDIR=$pkgdir install
-
-    # Use the python2 executable
-    find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/staging/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/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD
deleted file mode 100644
index 5401eb688..000000000
--- a/staging/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 141522 2011-10-31 03:45:43Z 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.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeartwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
-	         'kdebase-workspace' 'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4d3611cbcd6052a7ba7137baa196c654d9d38d4d')
-
-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/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD
deleted file mode 100644
index 279e4bdca..000000000
--- a/staging/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 141523 2011-10-31 03:48:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.7.3
-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')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
-sha1sums=('ecf5d1cc087d78ba049fe65e06ee992a2fadcc19')
-
-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/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
deleted file mode 100644
index fd5d1d5b1..000000000
--- a/staging/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 141503 2011-10-31 03:28:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="KDE Base Runtime Environment"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-        'xorg-xauth' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
-optdepends=('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.bz2"
-        'libqzeitgeist08.patch')
-sha1sums=('293dec26e0d7278396d2ad0240d14aeea6060970'
-          '164c9e4305029cb68a2101cfeeb76c7066c2fd39')
-
-build() {
-    cd "${srcdir}"/kde-runtime-${pkgver}
-    patch -p1 -i "${srcdir}"/libqzeitgeist08.patch
-
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	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/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdebase-runtime/kdebase-runtime.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/staging/kdebase-runtime/libqzeitgeist08.patch b/staging/kdebase-runtime/libqzeitgeist08.patch
deleted file mode 100644
index f832cd8b2..000000000
--- a/staging/kdebase-runtime/libqzeitgeist08.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~	2011-10-29 15:46:55.003710230 +0000
-+++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt	2011-10-29 15:47:28.910716093 +0000
-@@ -21,7 +21,7 @@
-     )
- endif(Nepomuk_FOUND)
- 
--# Checking for QtZeitgeist
-+# Checking for QZeitgeist
- macro_optional_find_package(QZeitgeist)
- 
- if (QZEITGEIST_INCLUDE_DIR)
-@@ -30,8 +30,8 @@
- 
- macro_log_feature(
-         QZeitgeist_FOUND
--        "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
--        "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking")
-+        "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
-+        "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking")
- if (QZeitgeist_FOUND)
-     set(HAVE_QZEITGEIST 1)
-     include_directories(${QZEITGEIST_INCLUDE_DIR})
---- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~	2011-10-29 15:47:40.960836591 +0000
-+++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp	2011-10-29 15:48:57.034930073 +0000
-@@ -21,31 +21,31 @@
- 
- #ifndef HAVE_QZEITGEIST
- #ifdef __GNUC__
--    #warning "No QtZeitgeist, disabling desktop events processing"
-+    #warning "No QZeitgeist, disabling desktop events processing"
- #endif
- 
- #else // HAVE_QZEITGEIST
- 
- #include "ZeitgeistEventBackend.h"
- 
--#include <QtZeitgeist/QtZeitgeist>
--#include <QtZeitgeist/Interpretation>
--#include <QtZeitgeist/Manifestation>
-+#include <QZeitgeist/QZeitgeist>
-+#include <QZeitgeist/Interpretation>
-+#include <QZeitgeist/Manifestation>
- 
- static QString eventInterpretation(Event::Type type)
- {
-     switch (type) {
-         case Event::Accessed:
--            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
- 
-         case Event::Opened:
--            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
- 
-         case Event::Modified:
--            return QtZeitgeist::Interpretation::Event::ZGModifyEvent;
-+            return QZeitgeist::Interpretation::Event::ZGModifyEvent;
- 
-         case Event::Closed:
--            return QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
-+            return QZeitgeist::Interpretation::Event::ZGLeaveEvent;
- 
-     }
- 
-@@ -57,23 +57,23 @@
- {
-     switch (reason) {
-         case Event::User:
--            return QtZeitgeist::Manifestation::Event::ZGUserActivity;
-+            return QZeitgeist::Manifestation::Event::ZGUserActivity;
- 
-         case Event::Heuristic:
--            return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity;
-+            return QZeitgeist::Manifestation::Event::ZGHeuristicActivity;
- 
-         case Event::Scheduled:
--            return QtZeitgeist::Manifestation::Event::ZGScheduledActivity;
-+            return QZeitgeist::Manifestation::Event::ZGScheduledActivity;
- 
-         case Event::System:
--            return QtZeitgeist::Manifestation::Event::ZGSystemNotification;
-+            return QZeitgeist::Manifestation::Event::ZGSystemNotification;
- 
-         case Event::World:
--            return QtZeitgeist::Manifestation::Event::ZGWorldActivity;
-+            return QZeitgeist::Manifestation::Event::ZGWorldActivity;
-     }
- 
-     // shut up GCC
--    return QtZeitgeist::Manifestation::Event::ZGUserActivity;
-+    return QZeitgeist::Manifestation::Event::ZGUserActivity;
- }
- 
- static QString applicationUri(const QString & application)
-@@ -84,7 +84,6 @@
- 
- ZeitgeistEventBackend::ZeitgeistEventBackend()
- {
--    QtZeitgeist::init();
- }
- 
- void ZeitgeistEventBackend::addEvents(const EventList & events)
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
deleted file mode 100644
index ebbb49727..000000000
--- a/staging/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 141663 2011-11-01 20:17:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.7.3
-pkgrel=3
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-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' 'consolekit' 'xorg-xprop' 'libxdamage'
-         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python'
-             'networkmanager')
-optdepends=('kde-wallpapers: officials KDE wallapers')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
-          'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
-           'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
-        'etc/pam.d/kde'
-        'etc/pam.d/kde-np'
-        'etc/pam.d/kscreensaver')
-options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
-        'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e'
-          '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'f7b38af38549242a240f1a90ab9964ca8a366129'
-          '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
-
-build() {
-	cd "${srcdir}"/${_pkgname}-${pkgver}
-	patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch
-    patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-	patch -p0 -i "${srcdir}"/fixpath.patch
-	patch -p0 -i "${srcdir}"/terminate-server.patch
-
-	cd "${srcdir}"
-	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 \
-        -DWITH_OpenGLES=OFF \
-        -DKWIN_BUILD_WITH_OPENGLES=OFF \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
-	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
-}
diff --git a/staging/kdebase-workspace/fix-powerprofiles.patch b/staging/kdebase-workspace/fix-powerprofiles.patch
deleted file mode 100644
index 309fcf3db..000000000
--- a/staging/kdebase-workspace/fix-powerprofiles.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Dario Freddi <drf@kde.org>
-Date: Tue, 04 Oct 2011 14:09:09 +0000
-Subject: Use full config when reading settings
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=8d59876457387d1c72ca3626ae2d267adf100014
----
-Use full config when reading settings
-
-BUG: 267323
----
-
-
---- a/powerdevil/daemon/powerdevilcore.cpp
-+++ b/powerdevil/daemon/powerdevilcore.cpp
-@@ -88,7 +88,7 @@ void Core::onBackendReady()
- {
-     kDebug() << "Backend is ready, KDE Power Management system initialized";
- 
--    m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig);
-+    m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::FullConfig);
- 
-     // Is it brand new?
-     if (m_profilesConfig->groupList().isEmpty()) {
-
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/staging/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/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
deleted file mode 100644
index 81eeef47b..000000000
--- a/staging/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth		required	pam_nologin.so
-auth		required	pam_permit.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
-\ No newline at end of file
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
deleted file mode 100644
index 1a259390f..000000000
--- a/staging/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
-\ No newline at end of file
diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/staging/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/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/staging/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/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch
deleted file mode 100644
index f5fc0e571..000000000
--- a/staging/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/staging/kdebase-workspace/kdm-zsh-profile.patch b/staging/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/staging/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c	2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c	2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- "    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- "    zhome=${ZDOTDIR:-$HOME}\n"
- "    # zshenv is always sourced automatically.\n"
--"    [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+"    [ -f /etc/profile ] && . /etc/profile\n"
- "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/staging/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/staging/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/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD
deleted file mode 100644
index ce91f654a..000000000
--- a/staging/kdebase/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 141515 2011-10-31 03:39:22Z 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.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('952dc26d0d908b41973a8d7b4d27765bf5128d58')
-
-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/"
-	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.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/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdebindings-kimono/PKGBUILD b/staging/kdebindings-kimono/PKGBUILD
deleted file mode 100644
index 0907aa11c..000000000
--- a/staging/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141524 2011-10-31 03:48:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.7.3
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the KDE libraries"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('d87622d46bce9a5f8b875393ac2292f5a57d5f78')
-
-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/staging/kdebindings-korundum/PKGBUILD b/staging/kdebindings-korundum/PKGBUILD
deleted file mode 100644
index c0a99734d..000000000
--- a/staging/kdebindings-korundum/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141525 2011-10-31 03:49:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-korundum
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="KDE bindings for ruby"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('bf41817298a8b18ba3542e45256c1c6ddb08c900')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../korundum-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-kross/PKGBUILD b/staging/kdebindings-kross/PKGBUILD
deleted file mode 100644
index 1fcaf90af..000000000
--- a/staging/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 141526 2011-10-31 03:49:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-#         'kdebindings-kross-ruby'
-         'kdebindings-kross-java')
-pkgver=4.7.3
-pkgrel=1
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
-source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
-sha1sums=('3e31b85d1a27a273450652d9f5a33f2c3c035329')
-
-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' 'openjdk6')
-
-  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/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD
deleted file mode 100644
index d071ab904..000000000
--- a/staging/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141527 2011-10-31 03:50:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="Perl bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-perlqt' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
-            'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
-sha1sums=('e0cc0d644084f1c71b6afc30d5467c49ba9a9fab')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlkde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD
deleted file mode 100644
index 8ea5e964c..000000000
--- a/staging/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 141510 2011-10-31 03:33:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="Perl bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
-sha1sums=('6e69719edccb23e3ced7ba30b72e88d214d6f54e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD
deleted file mode 100644
index 55174b915..000000000
--- a/staging/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141511 2011-10-31 03:33:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-python
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
-sha1sums=('16063793d39fdc9f5b9916cab49236103ce79da2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdebindings-qtruby/PKGBUILD b/staging/kdebindings-qtruby/PKGBUILD
deleted file mode 100644
index 38ecb16c2..000000000
--- a/staging/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141513 2011-10-31 03:35:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="Qt bindings for ruby"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('2e3b36ece9039ccd39be76145575015503c6283c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qtruby-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-qyoto/PKGBUILD b/staging/kdebindings-qyoto/PKGBUILD
deleted file mode 100644
index a92100c9b..000000000
--- a/staging/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141512 2011-10-31 03:34:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.7.3
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the Qt libraries"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('676042633b8c426adf1f47ad143f5db20ae257ef')
-
-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/staging/kdebindings-smokegen/PKGBUILD b/staging/kdebindings-smokegen/PKGBUILD
deleted file mode 100644
index 77ffaefc3..000000000
--- a/staging/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 141505 2011-10-31 03:29:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="A general purpose C++ parser with a plugin infrastructure"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('ede4095fdb190b3bef13b246111e7d79903ad77e')
-
-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/staging/kdebindings-smokekde/PKGBUILD b/staging/kdebindings-smokekde/PKGBUILD
deleted file mode 100644
index f5ef66836..000000000
--- a/staging/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141509 2011-10-31 03:33:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="Language independent library for KDE bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
-sha1sums=('a25114d92c540f16af9022366ca2b5da447a1531')
-
-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/staging/kdebindings-smokeqt/PKGBUILD b/staging/kdebindings-smokeqt/PKGBUILD
deleted file mode 100644
index 4dd11fb5b..000000000
--- a/staging/kdebindings-smokeqt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141506 2011-10-31 03:30:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokeqt
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="Language independent library for Qt bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
-sha1sums=('cf1c4b7116695f0842972b2985eca65f6b63702e')
-
-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/staging/kdeedu-blinken/PKGBUILD b/staging/kdeedu-blinken/PKGBUILD
deleted file mode 100644
index bbcc0704b..000000000
--- a/staging/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141528 2011-10-31 03:50:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.7.3
-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.bz2")
-sha1sums=('24f09f604e1687062b3296a30b873d1781379543')
-
-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/staging/kdeedu-blinken/kdeedu-blinken.install b/staging/kdeedu-blinken/kdeedu-blinken.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD
deleted file mode 100644
index 2595174c9..000000000
--- a/staging/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141529 2011-10-31 03:51:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.7.3
-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')
-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.bz2")
-sha1sums=('ce6240d44cbf47b3dbfd1dbc03196c916e4394e9')
-
-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/staging/kdeedu-cantor/kdeedu-cantor.install b/staging/kdeedu-cantor/kdeedu-cantor.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeedu-kalgebra/PKGBUILD b/staging/kdeedu-kalgebra/PKGBUILD
deleted file mode 100644
index f00c6ebc3..000000000
--- a/staging/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141530 2011-10-31 03:52:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.7.3
-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')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
-sha1sums=('88cc89a6c942b7cef548532702c5e68bf75f0748')
-
-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/staging/kdeedu-kalgebra/kdeedu-kalgebra.install b/staging/kdeedu-kalgebra/kdeedu-kalgebra.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeedu-kalzium/PKGBUILD b/staging/kdeedu-kalzium/PKGBUILD
deleted file mode 100644
index 82fb82d38..000000000
--- a/staging/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141531 2011-10-31 03:53:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.7.3
-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')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
-sha1sums=('e22b54be4a2e8ce8a22af73fa6155ee012fa6fdf')
-
-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/staging/kdeedu-kalzium/kdeedu-kalzium.install b/staging/kdeedu-kalzium/kdeedu-kalzium.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-kanagram/PKGBUILD b/staging/kdeedu-kanagram/PKGBUILD
deleted file mode 100644
index 691e39965..000000000
--- a/staging/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141532 2011-10-31 03:53:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.7.3
-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.bz2")
-sha1sums=('44a60b76bbc8ae61b8673c37c2b8721f12dc22bb')
-
-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/staging/kdeedu-kanagram/kdeedu-kanagram.install b/staging/kdeedu-kanagram/kdeedu-kanagram.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-kbruch/PKGBUILD b/staging/kdeedu-kbruch/PKGBUILD
deleted file mode 100644
index 770c61017..000000000
--- a/staging/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141533 2011-10-31 03:54:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.7.3
-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.bz2")
-sha1sums=('c90205954d9c153aaa5966b424aa437b07e657f7')
-
-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/staging/kdeedu-kbruch/kdeedu-kbruch.install b/staging/kdeedu-kbruch/kdeedu-kbruch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-kgeography/PKGBUILD b/staging/kdeedu-kgeography/PKGBUILD
deleted file mode 100644
index c57f47f22..000000000
--- a/staging/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141534 2011-10-31 03:55:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.7.3
-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.bz2")
-sha1sums=('5f9835994ec6ad9454f7ee19bf003c8457e11d9e')
-
-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/staging/kdeedu-kgeography/kdeedu-kgeography.install b/staging/kdeedu-kgeography/kdeedu-kgeography.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-khangman/PKGBUILD b/staging/kdeedu-khangman/PKGBUILD
deleted file mode 100644
index 58dc031c2..000000000
--- a/staging/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141535 2011-10-31 03:56:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.7.3
-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.bz2")
-sha1sums=('aef288a20209a4c1bf5d6f48be689c433049ea83')
-
-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/staging/kdeedu-khangman/kdeedu-khangman.install b/staging/kdeedu-khangman/kdeedu-khangman.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD
deleted file mode 100644
index 4c16ae22c..000000000
--- a/staging/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141536 2011-10-31 03:57:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.7.3
-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.bz2")
-sha1sums=('5a948b641f380e1cc6cf0f91d795a97029464bbb')
-
-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/staging/kdeedu-kig/kdeedu-kig.install b/staging/kdeedu-kig/kdeedu-kig.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeedu-kiten/PKGBUILD b/staging/kdeedu-kiten/PKGBUILD
deleted file mode 100644
index 85819d4ad..000000000
--- a/staging/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141537 2011-10-31 03:57:54Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.7.3
-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.bz2")
-sha1sums=('5df19802a731b5f7033b43aa9b35e0b20164cd3e')
-
-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/staging/kdeedu-kiten/kdeedu-kiten.install b/staging/kdeedu-kiten/kdeedu-kiten.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-klettres/PKGBUILD b/staging/kdeedu-klettres/PKGBUILD
deleted file mode 100644
index c94af13f0..000000000
--- a/staging/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141538 2011-10-31 03:58:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.7.3
-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.bz2")
-sha1sums=('da01b1c71d74f634ace0b6c2fc6e0186a08f9974')
-
-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/staging/kdeedu-klettres/kdeedu-klettres.install b/staging/kdeedu-klettres/kdeedu-klettres.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-kmplot/PKGBUILD b/staging/kdeedu-kmplot/PKGBUILD
deleted file mode 100644
index 74c3b478b..000000000
--- a/staging/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141539 2011-10-31 03:59:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.7.3
-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.bz2")
-sha1sums=('e98ba022e987b9601ea1b27e97607ff7885ff788')
-
-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/staging/kdeedu-kmplot/kdeedu-kmplot.install b/staging/kdeedu-kmplot/kdeedu-kmplot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD
deleted file mode 100644
index 0b9a0ee61..000000000
--- a/staging/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141540 2011-10-31 04:00:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.7.3
-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' 'eigen' 'cfitsio' 'libindi')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
-sha1sums=('41d333f726d9752a7ddb48f98817d91744adb7b0')
-
-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/staging/kdeedu-kstars/kdeedu-kstars.install b/staging/kdeedu-kstars/kdeedu-kstars.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-ktouch/PKGBUILD b/staging/kdeedu-ktouch/PKGBUILD
deleted file mode 100644
index 73dec62cb..000000000
--- a/staging/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141541 2011-10-31 04:01:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.7.3
-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.bz2")
-sha1sums=('46b865ece6e14d4476297d4a3b400d5fab6564ea')
-
-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/staging/kdeedu-ktouch/kdeedu-ktouch.install b/staging/kdeedu-ktouch/kdeedu-ktouch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-kturtle/PKGBUILD b/staging/kdeedu-kturtle/PKGBUILD
deleted file mode 100644
index b19d23916..000000000
--- a/staging/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141542 2011-10-31 04:02:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.7.3
-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.bz2")
-sha1sums=('07d5ad5c1b8308c2c8c2ff48e2c0c18adfd051ca')
-
-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/staging/kdeedu-kturtle/kdeedu-kturtle.install b/staging/kdeedu-kturtle/kdeedu-kturtle.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeedu-kwordquiz/PKGBUILD b/staging/kdeedu-kwordquiz/PKGBUILD
deleted file mode 100644
index 65da2d122..000000000
--- a/staging/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141543 2011-10-31 04:02:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.7.3
-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.bz2")
-sha1sums=('616c16a94066ec2930bc0795f8053be221c871e5')
-
-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/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeedu-marble/PKGBUILD b/staging/kdeedu-marble/PKGBUILD
deleted file mode 100644
index b2efffac0..000000000
--- a/staging/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141517 2011-10-31 03:41:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.7.3
-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.bz2")
-sha1sums=('980a8dae9c7a0f8483fde5dc839fae834763933a')
-
-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/staging/kdeedu-marble/kdeedu-marble.install b/staging/kdeedu-marble/kdeedu-marble.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD
deleted file mode 100644
index 714f5b2b5..000000000
--- a/staging/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141544 2011-10-31 04:03:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.7.3
-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.bz2")
-sha1sums=('a5d06f373976554d58c8aae279e411a6be028826')
-
-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/staging/kdeedu-parley/kdeedu-parley.install b/staging/kdeedu-parley/kdeedu-parley.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index 79c6074f0..000000000
--- a/staging/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141545 2011-10-31 04:04:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.7.3
-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' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('5c7d4115f029e09a006912bf816d4ce396a9b49a')
-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/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD
deleted file mode 100644
index bcdce95b2..000000000
--- a/staging/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141546 2011-10-31 04:05:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.7.3
-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' 'eigen')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
-sha1sums=('411695882916a8a1d0db86426a0d8f935fab21ad')
-
-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/staging/kdeedu-step/kdeedu-step.install b/staging/kdeedu-step/kdeedu-step.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
deleted file mode 100644
index 9cdb3e8f1..000000000
--- a/staging/kdegames/PKGBUILD
+++ /dev/null
@@ -1,515 +0,0 @@
-# $Id: PKGBUILD 141547 2011-10-31 04:09:11Z 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-kbattleship'
-         '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-knetwalk'
-         'kdegames-kolf'
-         'kdegames-kollision'
-         'kdegames-konquest'
-         'kdegames-kpatience'
-         'kdegames-kreversi'
-         'kdegames-kshisen'
-         'kdegames-ksirk'
-         'kdegames-kspaceduel'
-         'kdegames-ksquares'
-         'kdegames-ksudoku'
-         'kdegames-ktron'
-         'kdegames-ktuberling'
-         'kdegames-kubrick'
-         'kdegames-libkdegames'
-         'kdegames-libkmahjongg'
-         'kdegames-lskat'
-         'kdegames-palapeli')
-pkgver=4.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
-             'kdebindings-python' 'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('abd90be42fa67cd6d6be1defe90dcd0408e94445')
-
-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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/granatier
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
-	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
-	install='kdegames.install'
-	cd $srcdir/build/kajongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/katomic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbattleship() {
-	pkgdesc='Battleship Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kbattleship/"
-	install='kdegames-kbattleship.install'
-	cd $srcdir/build/kbattleship
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbattleship
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
-		$pkgdir/usr/share/ggz/kbattleship.dsc
-}
-
-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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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.install'
-	replaces=('kdegames-kpat')
-	cd $srcdir/build/kpat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kpat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
-	pkgdesc='Reversi Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames-kreversi.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kreversi
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \
-		$pkgdir/usr/share/ggz/kreversi.dsc
-}
-
-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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/kspaceduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
-	pkgdesc='Connect the dots to create squares'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames-ksquares.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksquares
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
-		$pkgdir/usr/share/ggz/ksquares.dsc
-}
-
-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
-	cd $srcdir/build/doc/ksudoku
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktron() {
-	pkgdesc='Tron-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktron/"
-	install='kdegames.install'
-	cd $srcdir/build/ktron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktron
-	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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/kubrick
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
-	pkgdesc='KDE game library'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkdegames
-	make DESTDIR=$pkgdir install
-	for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
-		install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
-	done
-}
-
-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
-	cd $srcdir/build/doc/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
-	cd $srcdir/build/doc/palapeli
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ac4516ed0..000000000
--- a/staging/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-	ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kbattleship.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/staging/kdegames/kdegames-kfourinline.install b/staging/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/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/staging/kdegames/kdegames-kigo.install b/staging/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/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/staging/kdegames/kdegames-kolf.install b/staging/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/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/staging/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/staging/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kreversi.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-kspaceduel.install b/staging/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/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/staging/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/staging/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/ksquares.dsc ]; then
-		ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-ktuberling.install b/staging/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/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/staging/kdegames/kdegames-lskat.install b/staging/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/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/staging/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/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/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD
deleted file mode 100644
index 1813e5dca..000000000
--- a/staging/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141548 2011-10-31 04:11:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.7.3
-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.bz2")
-sha1sums=('7096721285d15311699acc76abd62755d6e93860')
-
-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/staging/kdegraphics-gwenview/kdegraphics-gwenview.install b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdegraphics-kamera/PKGBUILD b/staging/kdegraphics-kamera/PKGBUILD
deleted file mode 100644
index 200c185f1..000000000
--- a/staging/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 141549 2011-10-31 04:11:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.7.3
-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.bz2")
-sha1sums=('820f9b6449732f6cab48f5c2d9e7dbcf53eb6437')
-
-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/staging/kdegraphics-kcolorchooser/PKGBUILD b/staging/kdegraphics-kcolorchooser/PKGBUILD
deleted file mode 100644
index d2e223249..000000000
--- a/staging/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141550 2011-10-31 04:12:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.7.3
-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.bz2")
-sha1sums=('bdd35e5defbcfc151f4960541c351246cb4dfa9e')
-
-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/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdegraphics-kgamma/PKGBUILD b/staging/kdegraphics-kgamma/PKGBUILD
deleted file mode 100644
index 1dccd786c..000000000
--- a/staging/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 141551 2011-10-31 04:12:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.7.3
-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.bz2")
-sha1sums=('d97511574120614ffb85308888c23eb2d3ba1b01')
-
-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/staging/kdegraphics-kolourpaint/PKGBUILD b/staging/kdegraphics-kolourpaint/PKGBUILD
deleted file mode 100644
index 6f88fd91b..000000000
--- a/staging/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141552 2011-10-31 04:13:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.7.3
-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.bz2")
-sha1sums=('d276d230e76f7fbe91229dd015a6465cb1a6956e')
-
-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/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdegraphics-kruler/PKGBUILD b/staging/kdegraphics-kruler/PKGBUILD
deleted file mode 100644
index ab4516da1..000000000
--- a/staging/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141553 2011-10-31 04:14:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.7.3
-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.bz2")
-sha1sums=('2cc0b9d31248604ab570404a0c67ef325e8ed00e')
-
-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/staging/kdegraphics-kruler/kdegraphics-kruler.install b/staging/kdegraphics-kruler/kdegraphics-kruler.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdegraphics-ksaneplugin/PKGBUILD b/staging/kdegraphics-ksaneplugin/PKGBUILD
deleted file mode 100644
index f3b2c53af..000000000
--- a/staging/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141554 2011-10-31 04:14:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="A scan plugin that implements the scanning"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('547c298e2f3f7b8f651e3402bf18507321d4a7ce')
-
-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/staging/kdegraphics-ksnapshot/PKGBUILD b/staging/kdegraphics-ksnapshot/PKGBUILD
deleted file mode 100644
index 893196c9b..000000000
--- a/staging/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141555 2011-10-31 04:15:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.7.3
-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.bz2")
-sha1sums=('e0dd6e093cd487fa6604077371122d84b3e8efb7')
-
-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/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdegraphics-mobipocket/PKGBUILD b/staging/kdegraphics-mobipocket/PKGBUILD
deleted file mode 100644
index cc2b96ac8..000000000
--- a/staging/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141556 2011-10-31 04:16:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="A collection of plugins to handle mobipocket files"
-url="http://kde.org/"
-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/mobipocket-${pkgver}.tar.bz2")
-sha1sums=('a55908cbc951c98dd27171909c1ccc5d978eec65')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../mobipocket-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index c34c81754..000000000
--- a/staging/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141507 2011-10-31 03:31:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.7.3
-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=('pkgconfig' 'cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('a14700386f386cc50f7dd6785eeb93dae10a0362')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index 563ece77a..000000000
--- a/staging/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141557 2011-10-31 04:16:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('827b18fd902a464162db7a3cd98a22fa211bafc9')
-
-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/staging/kdegraphics-svgpart/PKGBUILD b/staging/kdegraphics-svgpart/PKGBUILD
deleted file mode 100644
index cab788924..000000000
--- a/staging/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141558 2011-10-31 04:17:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="A KPart for viewving SVGs"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('fa7f8cac53f6041f18a2bee09c2aa3885e27f7c7')
-
-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/staging/kdegraphics-thumbnailers/PKGBUILD b/staging/kdegraphics-thumbnailers/PKGBUILD
deleted file mode 100644
index e2b966f86..000000000
--- a/staging/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141559 2011-10-31 04:17:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="Thumbnailers for various graphics file formats"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('219fd55d94d695cee8c7b650dbe8088cc9807e5c')
-
-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/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
deleted file mode 100644
index 20f208e2e..000000000
--- a/staging/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 141500 2011-10-31 03:23:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
-        'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
-        'docbook-xsl')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
-        'hspell')
-replaces=('kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('4f1bbd1b4d558f3541057747db9bf7e9dcececb3'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
-       cd "${srcdir}"
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/staging/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>
diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/staging/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdelibs/kdelibs.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/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD
deleted file mode 100644
index d0a68e235..000000000
--- a/staging/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 141889 2011-11-02 18:39:03Z andrea $
-# 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.7.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
-            'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config')
-sha1sums=('4db44494e6a2ef886e3513b6a2eb4e526741a6ff'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
-
-build() {
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xine=OFF
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dragonplayer
-	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' 'tunepimp')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/juk
-	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 doc/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/doc/kmix
-	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
-	cd $srcdir/build/doc/kcontrol/cddbretrieval
-	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/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/staging/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD
deleted file mode 100644
index 82f8a130b..000000000
--- a/staging/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 141561 2011-10-31 04:19:15Z 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.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
-    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-    'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7')
-
-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
-	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')
-	optdepends=('python2: YouTube plugin')
-	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork.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' 'v4l-utils' 'libgadu' 'mediastreamer')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork.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.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' 'libvncserver' 'rdesktop' 'telepathy-qt4')
-    optdepends=('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')
-	cd $srcdir/build/krfb
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krfb
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD
deleted file mode 100644
index a6e0c518c..000000000
--- a/staging/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141504 2011-10-31 03:29:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.7.3
-pkgrel=1
-pkgdesc='KDE PIM Runtime Environment'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'kdebase-runtime')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('fa0e336e17f7abea1e36d28d941a4ef79b4e4635')
-
-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
-}
diff --git a/staging/kdepim-runtime/kdepim-runtime.install b/staging/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdepim-runtime/kdepim-runtime.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/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD
deleted file mode 100644
index a3499afe3..000000000
--- a/staging/kdepim/PKGBUILD
+++ /dev/null
@@ -1,252 +0,0 @@
-# $Id: PKGBUILD 141562 2011-10-31 04:20:16Z 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-libkdepim'
-         'kdepim-wizards')
-pkgver=4.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
-             'pilot-link' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('b540de51ba5b9995ce3b7c05cfb09112423d8569')
-
-build() {
-    cd "${srcdir}"
-	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
-}
-
-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')
-	url="http://kde.org/applications/utilities/kleopatra/"
-	cd "${srcdir}"/build/kleopatra
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kleopatra
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
-	pkgdesc='Mail Client'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim.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 ksendemail libksieve mailcommon \
-		nepomuk_email_feeder 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.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knode
-	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; 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.install'
-	cd "${srcdir}"/build/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/korganizer
-	make DESTDIR="${pkgdir}" install
-}
-
-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-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 calendarviews incidenceeditor-ng \
-		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-		messagecomposer messagecore messagelist messageviewer icons \
-		strigi-analyzer templateparser plugins/messageviewer \
-        plugins/ktexteditor; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-wizards() {
-	pkgdesc='KDE Groupware Wizard'
-	depends=('kdepim-kresources')
-	url='http://pim.kde.org'
-	cd "${srcdir}"/build/wizards
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD
deleted file mode 100644
index 8ad4c3f23..000000000
--- a/staging/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141501 2011-10-31 03:24:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b95822a3e38587744174308b629336cd3d0444f4')
-
-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
-}
diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/staging/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/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index 0a7aaf495..000000000
--- a/staging/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,603 +0,0 @@
-# $Id: PKGBUILD 141563 2011-10-31 04:21:38Z 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-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-wallpapers-mandelbrot'
-         'kdeplasma-addons-wallpapers-marble'
-         'kdeplasma-addons-wallpapers-pattern'
-         'kdeplasma-addons-wallpapers-virus'
-         'kdeplasma-addons-wallpapers-weather')
-pkgver=4.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-groups=('kde' 'kdeplasma-addons')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
-             'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('decdea2d081396c90daabc9af754a233b43a0783')
-
-build() {
-    cd "${srcdir}"
-	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-applets.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=('kdebase-workspace' '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-applets.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-applets.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-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=('kdebase-workspace' 'qwt')
-	install='kdeplasma-addons-applets.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=('kdebase-workspace')
-	optdepends=('scim: SCIM backend'
-		'fcitx: FCITX 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-workspace')
-	cd $srcdir/build/applets/konqprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
-	pkgdesc='List and launch Konsole profiles'
-	depends=('kdebase-workspace')
-	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-applets.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-applets.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=('kdebase-workspace' 'kdeplasma-addons-libs')
-	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-applets.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-applets.install'
-	cd $srcdir/build/applets/qalculate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
-	pkgdesc='Remember The Milk Todo list applet'
-	depends=('kdebase-workspace' '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=('kdebase-workspace')
-	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' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/unitconverter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weather() {
-	pkgdesc='Displays Weather information'
-	depends=('kdebase-workspace' '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=('kdebase-workspace' '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' 'kdeplasma-addons-libs')
-	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' 'kdeplasma-addons-libs')
-	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')
-	cd $srcdir/build/runners/katesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
-	pkgdesc='Matches Konqueror Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/konquerorsessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
-	pkgdesc='Matches Konsole Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/konsolesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
-	pkgdesc='Kopete Contact runner'
-	depends=('kdebase-workspace')
-	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-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-virus() {
-	pkgdesc='Virus'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/virus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-weather() {
-	pkgdesc='Weather'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/wallpapers/weather
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/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/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets.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/staging/kdesdk-kate/PKGBUILD b/staging/kdesdk-kate/PKGBUILD
deleted file mode 100644
index 7016b0091..000000000
--- a/staging/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 141508 2011-10-31 03:32:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.7.3
-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.bz2"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('d67e871a49d426246f2e555ace0ad5a303c41045'
-          'ab0c5d2a796b0f283154799add161c99f48ffcd5')
-
-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 \
-    -DBUILD_KTEXTEDITOR=OFF
-  make
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime')
-  groups=('kde' 'kdebase')
-  install='kdebase-kwrite.install'
-
-  cd "${srcdir}"/build/kwrite
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/part
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-kwrite')
-  groups=('kde' 'kdesdk')
-  install='kdesdk-kate.install'
-
-  cd "${srcdir}"/build/kate
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kate
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdesdk-kate/kdebase-kwrite.install b/staging/kdesdk-kate/kdebase-kwrite.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdesdk-kate/kdesdk-kate.install b/staging/kdesdk-kate/kdesdk-kate.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdesdk-kate/kdesdk-kate.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch b/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch
deleted file mode 100644
index 3c43eca0f..000000000
--- a/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kate-4.6.80/part/syntax/data/bash.xml~	2011-05-23 21:20:34.295137123 +0000
-+++ kate-4.6.80/part/syntax/data/bash.xml	2011-05-23 21:20:54.581993368 +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.12" 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.12" 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/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD
deleted file mode 100644
index 3804d4b56..000000000
--- a/staging/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,247 +0,0 @@
-# $Id: PKGBUILD 141564 2011-10-31 04:23:09Z 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-kdeaccounts-plugin'
-         'kdesdk-kdepalettes'
-         'kdesdk-kioslave'
-         'kdesdk-kmtrace'
-         'kdesdk-kompare'
-         'kdesdk-kpartloader'
-         'kdesdk-kprofilemethod'
-#         'kdesdk-kspy'
-         'kdesdk-kstartperf'
-         'kdesdk-kuiviewer'
-         'kdesdk-lokalize'
-         'kdesdk-okteta'
-         'kdesdk-poxml'
-#         'kdesdk-scheck'
-         'kdesdk-scripts'
-         'kdesdk-strigi-analyzer'
-         'kdesdk-umbrello')
-pkgver=4.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
-             'kdepimlibs' 'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'fix-python2-path.patch')
-sha1sums=('c0afae643345c92bce387ceafbcea59d3fbd812e'
-          'd05ca0231869c484fd3861955d960a60aff7dcfb')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# Fix python2 path
-	patch -Np1 -i ${srcdir}/fix-python2-path.patch
-	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-		-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-		$(find . -name '*.py')
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdesdk-cervisia() {
-	pkgdesc='CVS Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/cervisia/"
-	install='kdesdk.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' 'subversion' 'git' 'kdesdk-kompare')
-	install='kdesdk.install'
-	cd $srcdir/build/dolphin-plugins/git
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dolphin-plugins/svn
-	make DESTDIR=$pkgdir install
-}
-
-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.install'
-	cd $srcdir/build/kcachegrind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcachegrind
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdeaccounts-plugin() {
-        pkgdesc='KDE Repository Accounts'
-        depends=('kdepim-runtime')
-        cd $srcdir/build/kdeaccounts-plugin
-        make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdepalettes() {
-	pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
-	optdepends=('gimp')
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
-		$pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
-}
-
-package_kdesdk-kioslave() {
-	pkgdesc='KDED Subversion Module'
-	depends=('kdebase-runtime' 'subversion')
-	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.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.install'
-	cd $srcdir/build/kuiviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
-	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python')
-	url="http://kde.org/applications/development/lokalize/"
-	optdepends=('translate-toolkit: enable extra python script')
-	install='kdesdk.install'
-	cd $srcdir/build/lokalize
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lokalize
-	make DESTDIR=$pkgdir install
-}
-
-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
-}
-
-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.install'
-	cd $srcdir/build/umbrello
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/umbrello
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch
deleted file mode 100644
index c2c0745d1..000000000
--- a/staging/kdesdk/fix-python2-path.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~	2010-11-24 11:53:38.586666671 +0100
-+++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree	2010-11-24 11:53:38.623333337 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # _*_ coding: latin1 _*_
- 
- #
---- 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/rename_source_files~	2010-11-24 11:45:41.040000004 +0100
-+++ kdesdk-4.5.80/scripts/rename_source_files	2010-11-24 11:45:41.093333336 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- #
- # Copyright David Faure <faure@kde.org>, License LGPL v2
- #
---- 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
---- kdesdk-4.5.80/scripts/kde_generate_export_header~	2010-11-24 11:48:49.696666669 +0100
-+++ kdesdk-4.5.80/scripts/kde_generate_export_header	2010-11-24 11:48:49.753333338 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- 
- import os, sys, string
- 
---- kdesdk-4.5.80/scripts/reviewboarddiff~	2010-11-24 11:49:37.686666670 +0100
-+++ kdesdk-4.5.80/scripts/reviewboarddiff	2010-11-24 11:49:37.740000003 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # encoding: utf-8
- #
- # Generates reviewboard compatible diffs from git-svn repositories.
diff --git a/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/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/staging/kdesdk/kdesdk.install b/staging/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD
deleted file mode 100644
index 2a8df4c25..000000000
--- a/staging/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 141565 2011-10-31 04:24:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-pkgver=4.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('93d6f0a92c805de51fc68469f940f38858f81fbe')
-
-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/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeutils/PKGBUILD b/staging/kdeutils/PKGBUILD
deleted file mode 100644
index 15ae7e1c8..000000000
--- a/staging/kdeutils/PKGBUILD
+++ /dev/null
@@ -1,191 +0,0 @@
-# $Id: PKGBUILD 141580 2011-10-31 11:35:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname=('kdeutils-ark'
-         'kdeutils-filelight'
-         'kdeutils-kcalc'
-         'kdeutils-kcharselect'
-         'kdeutils-kdf'
-         'kdeutils-kfloppy'
-         'kdeutils-kgpg'
-         'kdeutils-kremotecontrol'
-         'kdeutils-ktimer'
-         'kdeutils-kwallet'
-         'kdeutils-printer-applet'
-         'kdeutils-superkaramba'
-         'kdeutils-sweeper')
-pkgver=4.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
-	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
-	'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('23fc9823647152d5d8cc250a55402c8930db4059')
-
-build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    
-    # Use Python2
-    sed -i 's|/usr/bin/python|/usr/bin/python2|' \
-      kcharselect/kcharselect-generate-datafile.py \
-      superkaramba/examples/richtext/rtext.py
-    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-      printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-
-	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_kdeutils-ark() {
-	pkgdesc='Archiving Tool'
-	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-	optdepends=('p7zip' 'zip' 'unzip' 'unrar')
-	url="http://kde.org/applications/utilities/ark/"
-	cd $srcdir/build/ark
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ark/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
-	pkgdesc='View disk usage information'
-	depends=('kdebase-runtime' 'qimageblitz')
-	replaces=('filelight')
-	conflicts=('filelight')
-	install='kdeutils.install'
-	url="http://methylblue.com/filelight/"
-	cd $srcdir/build/filelight
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/filelight/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
-	pkgdesc='Scientific Calculator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcalc/"
-	cd $srcdir/build/kcalc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcalc/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
-	pkgdesc='Character Selector'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcharselect/"
-	cd $srcdir/build/kcharselect
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcharselect/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
-	pkgdesc='View Disk Usage'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kdiskfree/"
-	install='kdeutils.install'
-	cd $srcdir/build/kdf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kdf/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
-	pkgdesc='Floppy Formatter'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfloppy/"
-	install='kdeutils.install'
-	cd $srcdir/build/kfloppy
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kfloppy/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
-	pkgdesc='A GnuPG frontend'
-	depends=('kdepim-runtime' 'kde-agent')
-	url="http://kde.org/applications/utilities/kgpg"
-	install='kdeutils.install'
-	cd $srcdir/build/kgpg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kgpg/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
-	pkgdesc='Configure your remote controls for use with applications'
-	replaces=('kdeutils-kdelirc')
-	conflicts=('kdeutils-kdelirc')
-	depends=('kdebase-workspace')
-	url="http://kde.org/applications/utilities/kremotecontrol"
-	install='kdeutils.install'
-	cd $srcdir/build/kremotecontrol
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kremotecontrol/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
-	pkgdesc='Countdown Launcher'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/ktimer"
-	install='kdeutils.install'
-	cd $srcdir/build/ktimer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ktimer/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
-	pkgdesc='Wallet Management Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kwalletmanager/"
-	install='kdeutils.install'
-	cd $srcdir/build/kwallet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwallet/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
-	pkgdesc='System tray icon for managing print jobs'
-	depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/printer-applet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/printer-applet/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-superkaramba() {
-	pkgdesc='An engine for cool desktop eyecandy'
-	depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
-	url="http://kde.org/applications/utilities/superkaramba"
-	install='kdeutils.install'
-	cd $srcdir/build/superkaramba
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
-	pkgdesc='System Cleaner'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/sweeper/"
-	cd $srcdir/build/sweeper
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/sweeper/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeutils/kdeutils.install b/staging/kdeutils/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeutils/kdeutils.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD
deleted file mode 100644
index 56c74272d..000000000
--- a/staging/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 141566 2011-10-31 04:24:49Z andrea $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdewebdev
-pkgname=('kdewebdev-kfilereplace'
-         'kdewebdev-kimagemapeditor'
-         'kdewebdev-klinkstatus'
-         'kdewebdev-kommander')
-pkgver=4.7.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
-	'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('11108698887d376d00f02cbdfa1496aa3cb268c1')
-
-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')
-	install='kdewebdev.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=('kdepim-runtime' 'tidyhtml')
-	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')
-	cd $srcdir/build/kommander
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD
deleted file mode 100644
index 04ee16493..000000000
--- a/staging/koffice/PKGBUILD
+++ /dev/null
@@ -1,306 +0,0 @@
-# $Id: PKGBUILD 142476 2011-11-10 12:11:05Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-
-pkgbase=koffice
-pkgname=(
-	'koffice-filters'
-	'koffice-interfaces'
-	'koffice-libs'
-	'koffice-plugins'
-	'koffice-pics'
-	'koffice-servicetypes'
-	'koffice-templates'
-	'koffice-tools'
-	'koffice-karbon'
-	'koffice-karbon-doc'
-#	'koffice-kchart'
-#	'koffice-kchart-doc'
-	'koffice-kexi'
-	'koffice-kexi-doc'
-	'koffice-kformula'
-	'koffice-kformula-doc'
-	'koffice-kounavail'
-	'koffice-kplato'
-#	'koffice-kplato-doc'
-	'koffice-kpresenter'
-	'koffice-kpresenter-doc'
-	'koffice-krita'
-#	'koffice-krita-doc' # no krita-doc anymore upstream
-	'koffice-kspread'
-	'koffice-kspread-doc'
-	'koffice-kword'
-#	'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources)
-	'koffice-handbook'
-	'koffice-thesaurus-doc'
-#	'koffice-kdgantt' # still an empty package
-)
-pkgver=2.3.3
-pkgrel=10
-arch=('i686' 'x86_64')
-url='http://koffice.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
-             'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'wv2')
-groups=('koffice')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch')
-sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
-            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
-            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739'
-            'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa')
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-
-	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
-	patch -p1 -i "${srcdir}"/gcc46.patch
-        patch -p1 -i "${srcdir}"/qt48fix.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-##### 1st package common files, depends, optdepends of the koffice applications #####
-
-package_koffice-filters(){
-	pkgdesc="Filters for the KDE office suite"
-	depends=('shared-mime-info')
-	optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
-                   'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
-                   'libkdcraw: support for raw images' 'poppler: support for pdf' 
-		   'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
-		   'koffice-kplato: Kplato filters')
-	install=filters.install
-        cd "${srcdir}/build/filters"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-interfaces(){
-	pkgdesc="Interfaces for the KDE office suite"
-	depends=('koffice-libs')
-	cd "${srcdir}/build/interfaces"
-	make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-libs(){
-	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'lcms' 'koffice-servicetypes')
-        cd "${srcdir}/build/libs"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-plugins(){
-	pkgdesc="Plugins for the KDE office suite"
-	depends=('koffice-libs')
-	replaces=('koffice-kchart')
-	conflicts=('koffice-kchart')
-        cd "${srcdir}/build/plugins"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-pics(){
-	pkgdesc="Icons for the KDE office suite"
-	depends=('desktop-file-utils' 'xdg-utils')
-	install=koffice.install
-        cd "${srcdir}/build/pics"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-servicetypes(){
-	pkgdesc="Servicetypes for the KDE office suite"
-        cd "${srcdir}/build/servicetypes"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-templates(){
-	pkgdesc="Templates for the KDE office suite"
-        cd "${srcdir}/build/templates"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-tools(){
-	pkgdesc="Tools for the KDE office suite"
-	depends=('koffice-libs' 'oxygen-icons')
-        cd "${srcdir}/build/tools"
-        make DESTDIR="${pkgdir}" install
-}
-
-#### package common files done #####
-
-#### package apps and their docs #####
-
-package_koffice-karbon(){
-	pkgdesc="Vector drawing application for KDE"
-	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-karbon-doc(){
-	pkgdesc="Documentation for karbon"
-        cd "${srcdir}/build/doc/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi(){
-        pkgdesc="Integrated data management application for the KDE office suite"
-        depends=('koffice-kspread' 'oxygen-icons')
-	install=koffice.install
-        cd "${srcdir}/build/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi-doc(){
-        pkgdesc="Documentation for kexi"
-        cd "${srcdir}/build/doc/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula(){
-        pkgdesc="Formula editor for the KDE office suite"
-	depends=('koffice-libs')
-	install=koffice.install
-        cd "${srcdir}/build/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula-doc() {
-	pkgdesc="Documentation for koffice-kformula"
-	cd "${srcdir}/build/doc/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-
-package_koffice-kounavail(){
-	pkgdesc="Kounavail for the KDE office suite"
-	depends=('koffice-libs')
-        cd "${srcdir}/build/kounavail"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kplato(){
-	pkgdesc="Project management application for KDE"
-	depends=('koffice-kword' 'oxygen-icons')
-	install=koffice.install
-        cd "${srcdir}/build/kplato"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-kplato-doc(){
-#	pkgdesc="Documentation for kplato"
-#        cd ${srcdir}/build/doc/kplato
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-kpresenter(){
-	pkgdesc="Presentation tool for KDE"
-	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kpresenter-doc(){
-	pkgdesc="Documentation for kpresenter"
-        cd "${srcdir}/build/doc/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-krita(){
-	pkgdesc="Graphics editor for KDE"
-	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
-		 'koffice-plugins' 'poppler-qt' 'opengtl')
-        optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images')
-	install=krita.install
-        cd "${srcdir}/build/krita"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-krita-doc(){
-#	pkgdesc="Documentation for krita"
-#        cd ${srcdir}/build/doc/krita
-#        make DESTDIR="${pkgdir}" install
-#}
-
-
-package_koffice-kspread(){
-	pkgdesc="Spreadsheet application for KDE"
-	depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons')
-	optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kspread-doc(){
-	pkgdesc="Documentation for kspread"
-	cd "${srcdir}/build/doc/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kword(){
-	pkgdesc="Wordprocessor for KDE"
-	depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \
-		'koffice-kounavail' 'koffice-plugins' 'wv2')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kword"
-        make DESTDIR="${pkgdir}" install
-
-        # some sed lines to have python2 in extension scripts
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py"
-}
-
-#package_koffice-kword-doc(){
-#	pkgdesc="Documentation for kword"
-#        cd ${srcdir}/build/doc/kword
-#        make DESTDIR="${pkgdir}" install
-#}
-
-##### package apps done #####
-
-#package_koffice-kchart(){
-#	pkgdesc="Charting tool for KDE"
-#	depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates')
-#        optdepends=('koffice-filters: import/export filters')
-#	install=koffice.install
-#        cd "${srcdir}/build/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kchart-doc(){
-#	pkgdesc="Documentation for kchart"
-#        cd "${srcdir}/build/doc/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kdgantt(){
-#	pkgdesc="Gantt for KDE"
-#        cd "${srcdir}/build/kdgantt"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-handbook() {
-	pkgdesc="Documentation for koffice"
-	cd "${srcdir}/build/doc/koffice"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-thesaurus-doc(){
-	pkgdesc="Documentation for koffice-thesaurus"
-	cd "${srcdir}/build/doc/thesaurus"
-        make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/koffice/filters.install b/staging/koffice/filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/koffice/filters.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/koffice/gcc46.patch b/staging/koffice/gcc46.patch
deleted file mode 100644
index dcf8a4f85..000000000
--- a/staging/koffice/gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc
---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46	2011-02-17 06:13:40.000000000 -0600
-+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc	2011-02-19 21:15:56.597142885 -0600
-@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp
-         return IT_FLOAT16;
-     case Imf::FLOAT:
-         return IT_FLOAT32;
-+    default:
-+    // shouldn't reach here
-+        return IT_UNSUPPORTED;
-     }
- }
- 
-@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace(
-     case IT_UNKNOWN:
-     case IT_UNSUPPORTED:
-         return 0;
-+    default:
-+    // shouldn't reach here
-+        return 0;
-     }
- }
- 
diff --git a/staging/koffice/kde4-koffice-libwpg02.patch b/staging/koffice/kde4-koffice-libwpg02.patch
deleted file mode 100644
index e2a55a216..000000000
--- a/staging/koffice/kde4-koffice-libwpg02.patch
+++ /dev/null
@@ -1,1323 +0,0 @@
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt
---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt	2011-01-18 07:40:25.000000000 +0100
-@@ -1,16 +1,11 @@
- 
--
- include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
- 
--set(wpgimport_PART_SRCS 
--WPGImport.cpp 
--OdgExporter.cxx
--FileOutputHandler.cxx
--GraphicsElement.cxx)
-+set(wpgimport_PART_SRCS WPGImport.cpp)
- 
- kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
- 
--target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
-+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
- 
- install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,95 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "FileOutputHandler.hxx"
--
--FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
--	mbIsTagOpened(false),
--	mContentStream(contentStream)
--{
--}
--
--void FileOutputHandler::startDocument()
--{
--}
--
--void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << "<" << psName;
--
--	for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
--	{
--		mContentStream << " " <<  (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
--	}
--	mbIsTagOpened = true;
--	msOpenedTagName = psName;
--}
--
--void FileOutputHandler::endElement(const char *psName)
--{
--	if (mbIsTagOpened)
--	{
--		if( msOpenedTagName == psName )
--		{
--			mContentStream << "/>";
--			mbIsTagOpened = false;
--		}
--		else // should not happen, but handle it
--		{
--			mContentStream << ">";
--			mContentStream << "</" << psName << ">";
--			mbIsTagOpened = false;
--		}
--	}
--	else
--	{
--		mContentStream << "</" << psName << ">";
--		mbIsTagOpened = false;
--	}
--}
--
--void FileOutputHandler::characters(const std::string &sCharacters)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << sCharacters.c_str();
--}
--
--void FileOutputHandler::endDocument()
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,49 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef FILEOUTPUTHANDLER_H
--#define FILEOUTPUTHANDLER_H
--
--#include <iostream>
--#include <sstream>
--#include <string>
--#include "GraphicsHandler.hxx"
--
--class FileOutputHandler : public GraphicsHandler
--{
--  public:
--        explicit FileOutputHandler(std::ostringstream &contentStream);
--        virtual void startDocument();
--        virtual void endDocument();
--        virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
--        virtual void endElement(const char *psName);
--        virtual void characters(const std::string &sCharacters);
--
--  private:
--	bool mbIsTagOpened;
--	std::string msOpenedTagName;
--	std::ostringstream &mContentStream;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,66 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <string.h>
--
--#define ASCII_SPACE 0x0020
--
--void TagGraphicsElement::print() const
--{
--}
--
--void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->startElement(getTagName().c_str(), maAttrList);
--}
--
--void OpenTagGraphicsElement::print() const
--{ 
--	TagGraphicsElement::print(); 	
--}
--
--void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
--{
--	std::pair<std::string, std::string> tmpAttribute;
--	tmpAttribute.first = szAttributeName;
--	tmpAttribute.second = sAttributeValue;
--        maAttrList.push_back(tmpAttribute);
--}
--
--void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--
--	pHandler->endElement(getTagName().c_str());
--}
--
--void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->characters(msData);
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,84 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpd.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef _GRAPHICSELEMENT_H
--#define _GRAPHICSELEMENT_H
--#include <string>
--#include <map>
--#include <vector>
--
--#include "GraphicsHandler.hxx"
--
--class GraphicsElement
--{
--public:	
--	virtual ~GraphicsElement() {}
--	virtual void write(GraphicsHandler *pHandler) const = 0;
--	virtual void print() const {}
--};
--
--class TagGraphicsElement : public GraphicsElement
--{
--public:
--	explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
--	const std::string &getTagName() const { return msTagName; }
--	virtual void print() const;
--private:
--	const std::string msTagName;
--};
--
--class OpenTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	~OpenTagGraphicsElement() {}
--	void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
--	virtual void write(GraphicsHandler *pHandler) const;
--	virtual void print () const;
--private:
--	std::vector<std::pair<std::string, std::string> > maAttrList;
--};
--
--class CloseTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--};
--
--class CharDataGraphicsElement : public GraphicsElement
--{
--public:
--	CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--private:
--	std::string msData;
--};
--
--
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,43 +0,0 @@
--/*
-- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
-- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- *  Contributor(s): Martin Gallwey (gallwey@sun.com)
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--#ifndef _GRAPHICSHANDLER_H
--#define _GRAPHICSHANDLER_H
--#include <string>
--#include <map>
--#include <vector>
--
--class GraphicsHandler
--{
--public:
--	virtual ~GraphicsHandler() {}
--        virtual void startDocument() = 0;
--        virtual void endDocument() = 0;
--        virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
--        virtual void endElement(const char *psName) = 0;
--        virtual void characters(const std::string &sCharacters) = 0;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,662 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "OdgExporter.hxx"
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <locale.h>
--
--static std::string doubleToString(const double value)
--{
--  std::ostringstream tempStream;
--  tempStream << value;
--  std::string decimalPoint(localeconv()->decimal_point);
--  if ((decimalPoint.size() == 0) || (decimalPoint == "."))
--    return tempStream.str();
--  std::string stringValue(tempStream.str());
--  if (!stringValue.empty())
--  {
--    std::string::size_type pos;
--    while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
--          stringValue.replace(pos,decimalPoint.size(),".");
--  }
--  return stringValue;
--}
--
--
--OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
--        mpHandler(pHandler),
--        m_fillRule(AlternatingFill),
--        m_gradientIndex(1),
--        m_dashIndex(1),
--        m_styleIndex(1),
--        m_width(0.0f),
--        m_height(0.0f),
--        m_isFlatXML(isFlatXML)
--{
--}
--
--OdgExporter::~OdgExporter()
--{
--        for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                delete (*iterStroke);
--
--        for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                delete (*iterGradient);
--
--        for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                delete (*iterAutomaticStyles);
--
--        for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--                delete (*bodyIter);
--}
--
--void OdgExporter::startGraphics(double width, double height)
--{
--        m_gradientIndex = 1;
--        m_dashIndex = 1;
--        m_styleIndex = 1;
--        m_width = width;
--        m_height = height;
--
--
--        mpHandler->startDocument();
--        OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
--        tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
--        tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
--        tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
--        if (m_isFlatXML)
--                        tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
--        tmpOfficeDocumentContent.write(mpHandler);
--
--        OpenTagGraphicsElement("office:settings").write(mpHandler);
--
--        OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
--        configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
--        configItemSetOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement configItemOpenElement1("config:config-item");
--        configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
--        configItemOpenElement1.addAttribute("config:type", "int");
--        configItemOpenElement1.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement2("config:config-item");
--        configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
--        configItemOpenElement2.addAttribute("config:type", "int");
--        configItemOpenElement2.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement3("config:config-item");
--        configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
--        configItemOpenElement3.addAttribute("config:type", "int");
--        configItemOpenElement3.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * width);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement4("config:config-item");
--        configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
--        configItemOpenElement4.addAttribute("config:type", "int");
--        configItemOpenElement4.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * height);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        mpHandler->endElement("config:config-item-set");
--
--        mpHandler->endElement("office:settings");
--
--}
--
--void OdgExporter::endGraphics()
--{
--        OpenTagGraphicsElement("office:styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                (*iterStroke)->write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                (*iterGradient)->write(mpHandler);
--
--        mpHandler->endElement("office:styles");
--
--        OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                (*iterAutomaticStyles)->write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
--        tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
--        tmpStylePageLayoutOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
--        m_value.str("");
--        m_value <<  doubleToString(m_width) << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(m_height)  << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
--        m_value.str("");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
--        tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:page-layout-properties");
--
--        mpHandler->endElement("style:page-layout");
--
--        OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
--        tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
--        tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
--        tmpStyleStyleOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
--        // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
--        tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
--        tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:drawing-page-properties");
--
--        mpHandler->endElement("style:style");
--
--        mpHandler->endElement("office:automatic-styles");
--
--        OpenTagGraphicsElement("office:master-styles").write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
--        tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
--        tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
--        tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpStyleMasterPageOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:master-page");
--
--        mpHandler->endElement("office:master-styles");
--
--        OpenTagGraphicsElement("office:body").write(mpHandler);
--
--        OpenTagGraphicsElement("office:drawing").write(mpHandler);
--
--        OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
--        tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
--        tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
--        tmpDrawPageOpenElement.write(mpHandler);
--
--        for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--        {
--                (*bodyIter)->write(mpHandler);
--        }
--
--        mpHandler->endElement("draw:page");
--        mpHandler->endElement("office:drawing");
--        mpHandler->endElement("office:body");
--        mpHandler->endElement("office:document");
--
--        mpHandler->endDocument();
--}
--
--void OdgExporter::setPen(const libwpg::WPGPen& pen)
--{
--        m_pen = pen;
--}
--
--void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
--{
--        m_brush = brush;
--}
--
--void OdgExporter::setFillRule(FillRule rule)
--{
--        m_fillRule = rule;
--}
--
--void OdgExporter::startLayer(unsigned int)
--{
--}
--
--void OdgExporter::endLayer(unsigned int)
--{
--}
--
--void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawRectElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x2-rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y2-rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rx) << "in";
--        // FIXME: what to do when rx != ry ?
--        pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
--}
--
--void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.x - rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.y - ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
--}
--
--void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
--{
--        if(vertices.count() < 2)
--                return;
--
--        if(vertices.count() == 2)
--        {
--                const libwpg::WPGPoint& p1 = vertices[0];
--                const libwpg::WPGPoint& p2 = vertices[1];
--
--                writeStyle();
--                OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
--                m_value.str("");
--                m_value << "gr" << m_styleIndex-1;
--                pDrawLineElement->addAttribute("draw:style-name", m_value.str());
--                m_value.str("");
--                pDrawLineElement->addAttribute("draw:text-style-name", "P1");
--                pDrawLineElement->addAttribute("draw:layer", "layout");
--                m_value << doubleToString(p1.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x1", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p1.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y1", m_value.str());
--                m_value.str("");
--                m_value  << doubleToString(p2.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x2", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p2.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y2", m_value.str());
--                m_value.str("");
--                mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
--                mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
--        }
--        else
--        {
--                // draw as path
--                libwpg::WPGPath path;
--                path.moveTo(vertices[0]);
--                for(unsigned long ii = 1; ii < vertices.count(); ii++)
--                        path.lineTo(vertices[ii]);
--                path.closed = true;
--                drawPath(path);
--        }
--}
--
--void OdgExporter::drawPath(const libwpg::WPGPath& path)
--{
--        if(path.count() == 0)
--                return;
--
--        // try to find the bounding box
--        // this is simple convex hull technique, the bounding box might not be
--        // accurate but that should be enough for this purpose
--        libwpg::WPGPoint p = path.element(0).point;
--        libwpg::WPGPoint q = path.element(0).point;
--        for(unsigned k = 0; k < path.count(); k++)
--        {
--                libwpg::WPGPathElement element = path.element(k);
--                p.x = (p.x > element.point.x) ? element.point.x : p.x;
--                p.y = (p.y > element.point.y) ? element.point.y : p.y;
--                q.x = (q.x < element.point.x) ? element.point.x : q.x;
--                q.y = (q.y < element.point.y) ? element.point.y : q.y;
--                if(element.type == libwpg::WPGPathElement::CurveToElement)
--                {
--                        p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
--                        p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
--                        q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
--                        q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
--                        p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
--                        p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
--                        q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
--                        q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
--                }
--        }
--        double vw = q.x - p.x;
--        double vh = q.y - p.y;
--
--        writeStyle();
--
--        OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawPathElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        pDrawPathElement->addAttribute("draw:text-style-name", "P1");
--        pDrawPathElement->addAttribute("draw:layer", "layout");
--        m_value << doubleToString(p.x)  << "in";
--        pDrawPathElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(p.y)  << "in";
--        pDrawPathElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vw) << "in";
--        pDrawPathElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vh) << "in";
--        pDrawPathElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
--        pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
--        m_value.str("");
--
--        for(unsigned i = 0; i < path.count(); i++)
--        {
--                libwpg::WPGPathElement element = path.element(i);
--                libwpg::WPGPoint point = element.point;
--                switch(element.type)
--                {
--                        // 2540 is 2.54*1000, 2.54 in = 1 in
--                        case libwpg::WPGPathElement::MoveToElement:
--                                m_value << "M" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::LineToElement:
--                                m_value << "L" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::CurveToElement:
--                                m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra1.y-p.y)*2540) << " ";
--                                m_value << (int)((element.extra2.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra2.y-p.y)*2540) << " ";
--                                m_value << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        default:
--                                break;
--                }
--        }
--        if(path.closed)
--                m_value << " Z";
--        pDrawPathElement->addAttribute("svg:d", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
--}
--
--
--void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
--{
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary;
--        bitmap.generateBase64DIB(base64Binary);
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
--{
--        if (binaryData.mimeType.length() <= 0)
--                return;
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary = binaryData.getBase64Data();
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--
--static std::string colorToHex(const libwpg::WPGColor& color)
--{
--        char hexdigits[] = "0123456789abcdef";
--        char buffer[] = "123456";
--        buffer[0] = hexdigits[(color.red >> 4) & 15];
--        buffer[1] = hexdigits[color.red & 15];
--        buffer[2] = hexdigits[(color.green >> 4) & 15];
--        buffer[3] = hexdigits[color.green & 15];
--        buffer[4] = hexdigits[(color.blue >> 4) & 15];
--        buffer[5] = hexdigits[color.blue & 15];
--        return std::string(buffer);
--}
--
--void OdgExporter::writeStyle()
--{
--        m_value.str("");
--        m_name.str("");
--
--        if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
--        {
--                // ODG only supports dashes with the same length of spaces inbetween
--                // here we take the first space and assume everything else the same
--                // note that dash length is written in percentage
--                double distance = m_pen.dashArray.at(1);
--                OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
--                tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
--                m_value << "Dash_" << m_dashIndex++;
--                tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(distance*100) << "%";
--                tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
--                m_value.str("");
--                for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
--                {
--                        m_name << "draw:dots" << i+1;
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
--                        m_name.str("");
--                        m_name << "draw:dots" << i+1 << "-length";
--                        m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
--                        m_name.str("");
--                        m_value.str("");
--                }
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
--                tmpDrawGradientElement->addAttribute("draw:style", "linear");
--                m_value << "Gradient_" << m_gradientIndex++;
--                tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--
--                // ODG angle unit is 0.1 degree
--                double angle = -m_brush.gradient.angle();
--                while(angle < 0)
--                        angle += 360;
--                while(angle > 360)
--                        angle -= 360;
--
--                m_value << (unsigned)(angle*10);
--                tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
--                m_value.str("");
--
--                libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
--                libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
--                m_value << "#" << colorToHex(startColor);
--                tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(stopColor);
--                tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
--                m_value.str("");
--                tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:border", "0%");
--                mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
--                mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
--        }
--
--        OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
--        m_value << "gr" << m_styleIndex;
--        tmpStyleStyleElement->addAttribute("style:name", m_value.str());
--        m_value.str("");
--        tmpStyleStyleElement->addAttribute("style:family", "graphic");
--        tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
--
--        OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
--
--        if(m_pen.width > 0.0)
--        {
--                m_value << doubleToString(m_pen.width) << "in";
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(m_pen.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
--                m_value.str("");
--
--                if(!m_pen.solid)
--                {
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
--                        m_value << "Dash_" << m_dashIndex-1;
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
--                        m_value.str("");
--                }
--        }
--        else
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::NoBrush)
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::Solid)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
--                m_value << "#" << colorToHex(m_brush.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
--                m_value.str("");
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
--                m_value << "Gradient_" << m_gradientIndex-1;
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
--                m_value.str("");
--        }
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
--        m_styleIndex++;
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,116 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef __ODGEXPORTER_H__
--#define __ODGEXPORTER_H__
--
--#include <iostream>
--#include <sstream>
--#include <string>
--
--#include <libwpg/libwpg.h>
--#include "GraphicsElement.hxx"
--
--class OdgExporter : public libwpg::WPGPaintInterface {
--public:
--	explicit OdgExporter(GraphicsHandler *pHandler,
--			     const bool isFlatXML = false);
--	~OdgExporter();
--
--#if LIBWPG_VERSION_MINOR<2
--	void startGraphics(double imageWidth, double imageHeight);
--	void endGraphics();
--	void startLayer(unsigned int id);
--	void endLayer(unsigned int id);
--
--	void setPen(const libwpg::WPGPen& pen);
--	void setBrush(const libwpg::WPGBrush& brush);
--	void setFillRule(FillRule rule);
--
--	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
--	void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
--	void drawPolygon(const libwpg::WPGPointArray& vertices);
--	void drawPath(const libwpg::WPGPath& path);
--	void drawBitmap(const libwpg::WPGBitmap& bitmap);
--	void drawImageObject(const libwpg::WPGBinaryData& binaryData);
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	libwpg::WPGPen m_pen;
--	libwpg::WPGBrush m_brush;
--	FillRule m_fillRule;
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#else
--	virtual void startGraphics(const ::WPXPropertyList &propList);
--	virtual void endGraphics();
--	virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
--	virtual void startLayer(const ::WPXPropertyList &propList);
--	virtual void endLayer();
--	virtual void drawRectangle(const ::WPXPropertyList& propList);
--	virtual void drawEllipse(const ::WPXPropertyList& propList);
--	virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
--	virtual void drawPath(const ::WPXPropertyListVector &path);
--	virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
--	virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
--	virtual void endEmbeddedGraphics();
--	virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
--	virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
--	virtual void endTextObject();
--	virtual void startTextLine(const ::WPXPropertyList &propList);
--	virtual void endTextLine();
--	virtual void startTextSpan(const ::WPXPropertyList &propList);
--	virtual void endTextSpan();
--	virtual void insertText(const ::WPXString &str);
--
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#endif
--};
--
--#endif // __ODGEXPORTER_H__
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp
---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp	2011-01-02 17:46:15.000000000 +0100
-@@ -20,28 +20,26 @@
- #include <WPGImport.h>
- #include <WPGImport.moc>
- 
--#include <QBuffer>
--#include <QByteArray>
--#include <QString>
--
--#include <kdebug.h>
- #include <KoFilterChain.h>
- #include <KoGlobal.h>
- #include <KoUnit.h>
-+#include <KoXmlWriter.h>
-+
- #include <kpluginfactory.h>
-+#include <KDebug>
- 
--#include <KoXmlWriter.h>
-+
-+#include <QtCore/QString>
-+#include <QtCore/QFile>
- 
- #include <libwpg/libwpg.h>
- #if LIBWPG_VERSION_MINOR<2
- #include <libwpg/WPGStreamImplementation.h>
- #else
- #include <libwpd-stream/libwpd-stream.h>
-+#include <libwpd/libwpd.h>
- #endif
- 
--#include "FileOutputHandler.hxx"
--#include "OdgExporter.hxx"
--
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -56,35 +54,13 @@
- {
- }
- 
--static QByteArray createManifest()
--{
--    KoXmlWriter* manifestWriter;
--    QByteArray manifestData;
--    QBuffer manifestBuffer(&manifestData);
--
--    manifestBuffer.open(QIODevice::WriteOnly);
--    manifestWriter = new KoXmlWriter(&manifestBuffer);
--
--    manifestWriter->startDocument("manifest:manifest");
--    manifestWriter->startElement("manifest:manifest");
--    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
--    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
--    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
--    manifestWriter->addManifestEntry("content.xml", "text/xml");
--    manifestWriter->endElement();
--    manifestWriter->endDocument();
--    delete manifestWriter;
--
--    return manifestData;
--}
--
- 
- KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
- {
-     if (from != "application/x-wpg")
-         return KoFilter::NotImplemented;
- 
--    if (to != "application/vnd.oasis.opendocument.graphics")
-+    if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
- #if LIBWPG_VERSION_MINOR<2
-@@ -96,6 +72,7 @@
-             input = olestream;
-         }
-     }
-+    libwpg::WPGString output;
- #else
-     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
-     if (input->isOLEStream()) {
-@@ -105,59 +82,31 @@
-             input = olestream;
-         }
-      }
-+     ::WPXString output;
- #endif
- 
-     if (!libwpg::WPGraphics::isSupported(input)) {
--        std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
-+        kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
-         delete input;
-         return KoFilter::NotImplemented;
-     }
- 
--    // do the conversion
--    std::ostringstream tmpStringStream;
--    FileOutputHandler tmpHandler(tmpStringStream);
--    OdgExporter exporter(&tmpHandler);
--    libwpg::WPGraphics::parse(input, &exporter);
--    delete input;
--
--
--    // create output store
--    KoStore* storeout;
--    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
--                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
--
--    if (!storeout) {
--        kWarning() << "Couldn't open the requested file.";
--        return KoFilter::FileNotFound;
--    }
--
--#if 0
--    if (!storeout->open("styles.xml")) {
--        kWarning() << "Couldn't open the file 'styles.xml'.";
--        return KoFilter::CreationError;
-+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+        kWarning() << "ERROR: SVG Generation failed!";
-+        delete input;
-+        return KoFilter::ParsingError;
-     }
--    //storeout->write( createStyles() );
--    storeout->close();
--#endif
- 
--    if (!storeout->open("content.xml")) {
--        kWarning() << "Couldn't open the file 'content.xml'.";
--        return KoFilter::CreationError;
--    }
--    storeout->write(tmpStringStream.str().c_str());
--    storeout->close();
-+    delete input;
- 
--    // store document manifest
--    storeout->enterDirectory("META-INF");
--    if (!storeout->open("manifest.xml")) {
--        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
--        return KoFilter::CreationError;
-+    QFile outputFile(m_chain->outputFile());
-+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-+        return KoFilter::InternalError;
-     }
--    storeout->write(createManifest());
--    storeout->close();
- 
--    // we are done!
--    delete storeout;
-+    outputFile.write(output.cstr());
-+    outputFile.close();
- 
-     return KoFilter::OK;
- }
-
diff --git a/staging/koffice/koffice.install b/staging/koffice/koffice.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/koffice/koffice.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/koffice/krita.install b/staging/koffice/krita.install
deleted file mode 100644
index 5d458de55..000000000
--- a/staging/koffice/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
-}
diff --git a/staging/koffice/qt48fix.patch b/staging/koffice/qt48fix.patch
deleted file mode 100644
index de72926d5..000000000
--- a/staging/koffice/qt48fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-02-17 13:10:38.000000000 +0100
-+++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-09-08 15:03:31.932039128 +0200
-@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
--	<< "pixmap="<<ba.pixmap()
- 	<< ")";
-     return dbg;
- }
diff --git a/staging/kradio/PKGBUILD b/staging/kradio/PKGBUILD
deleted file mode 100644
index 485d59029..000000000
--- a/staging/kradio/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 142035 2011-11-04 16:35:33Z eric $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.2
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL2')
-pkgdesc="A comfortable KDE radio application"
-url="http://kradio.sourceforge.net/"
-depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
-makedepends=('pkg-config' 'automoc4' 'cmake')
-install=kradio.install
-source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
-options=(!libtool)
-
-build() {
-  cd "$srcdir"
-  (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff")
-  mkdir build
-  cd build
-  cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('18fea3e2bc7100882075187c6a89f7bd'
-         '5f407eb75536f39e79c77a70613e8704'
-         '7d31a4f54602bc109f39cc0a7a1dc50c')
diff --git a/staging/kradio/kradio-ffmpeg.diff b/staging/kradio/kradio-ffmpeg.diff
deleted file mode 100644
index 27d224fec..000000000
--- a/staging/kradio/kradio-ffmpeg.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988
-
-diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp
-index 4cd6cc0..c74d6e2 100644
---- a/plugins/internetradio/decoder_thread.cpp
-+++ b/plugins/internetradio/decoder_thread.cpp
-@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
- 
-     //av_log_set_level(255);
-     m_av_pFormatCtx = avformat_alloc_context();
--    memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx));
-     m_av_pFormatCtx->probesize = m_maxProbeSize;
-     m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE;
- 
-@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-         m_av_pFormatCtx_opened = true;
-     }
-     else {
--
- //         IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start");
-         if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) {
-             if (warningsNotErrors) {
-@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-     m_av_audioStream = -1;
-     for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
- //         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
-+#else
-+        if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
-+#endif
-             m_av_audioStream = i;
-             break;
-         }
diff --git a/staging/kradio/kradio.install b/staging/kradio/kradio.install
deleted file mode 100644
index af52669f5..000000000
--- a/staging/kradio/kradio.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
diff --git a/staging/libkdcraw/PKGBUILD b/staging/libkdcraw/PKGBUILD
deleted file mode 100644
index 477f2927d..000000000
--- a/staging/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141518 2011-10-31 03:42:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('084f6aff760957d2005dd571dad178ca685abb68')
-
-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/staging/libkdcraw/libkdcraw.install b/staging/libkdcraw/libkdcraw.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/libkdeedu/PKGBUILD b/staging/libkdeedu/PKGBUILD
deleted file mode 100644
index 5af6fd644..000000000
--- a/staging/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141516 2011-10-31 03:40:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="Libraries used by KDE Education applications"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('d2a1e88c6135fa23cea7670dfbb7c8634dc9c870')
-
-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/staging/libkdeedu/libkdeedu.install b/staging/libkdeedu/libkdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD
deleted file mode 100644
index 9bba11ce1..000000000
--- a/staging/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141519 2011-10-31 03:42:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('daaf507f75855660ae9f1af00158c2746c574902')
-
-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/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD
deleted file mode 100644
index d77ba4de4..000000000
--- a/staging/libkipi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141576 2011-10-31 08:07:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkipi
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="An interface to use kipi-plugins from a KDE application"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('9c6d4406a1292cfe81fa27508ffe4d96633417bf')
-
-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/staging/libkipi/libkipi.install b/staging/libkipi/libkipi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/libksane/PKGBUILD b/staging/libksane/PKGBUILD
deleted file mode 100644
index 0d1e5b0dc..000000000
--- a/staging/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141520 2011-10-31 03:44:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.7.3
-pkgrel=1
-pkgdesc="An image scanning library"
-url="http://kde.org/"
-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.bz2")
-sha1sums=('d1efdd1f5f7f99ba173ddcc88b2ddee343ecf96b')
-
-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/staging/libksane/libksane.install b/staging/libksane/libksane.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD
deleted file mode 100644
index e500fa453..000000000
--- a/staging/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,919 +0,0 @@
-# $Id: PKGBUILD 142267 2011-11-07 16:41:26Z 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-extension-barcode' # 
-	'libreoffice-extension-diagram'
-	'libreoffice-extension-google-docs'
-	'libreoffice-extension-hunart'
-	#'libreoffice-extension-lightproof' # no source integration
-	#'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
-	'libreoffice-extension-nlpsolver'
-	'libreoffice-extension-ct2n'
-	'libreoffice-extension-numbertext'	
-	'libreoffice-extension-oooblogger'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-extension-scripting-beanshell'
-	'libreoffice-extension-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-typo'
-	'libreoffice-extension-validator'
-	'libreoffice-extension-watch-window'
-	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.4.2
-pkgver=3.4.4
-pkgrel=2
-arch=('i686' 'x86_64')
-#_LO_tree="3.4"
-_OFFICEUPD="340"
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
-             'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment'
-              #'saxon' - currently broken 
-             # the depends from libreoffice main pkg
-             "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' "icu>=4.6" 'libxslt'
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
-	     '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://hg.services.openoffice.org/binaries"
-source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
-	${_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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	buildfix_boost.diff
-	buildfix_ct2n.diff
-	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff
-	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-	RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7)
-noextract=(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
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-	41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-	bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-	23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-	b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-	b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-	9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-	dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
-         'db423cbb1cee416b718138044a5de930'
-         '31944d2139d6d81ef1131bd513530621'
-         'f447fd4ffe54aab9561c6caa262754b3'
-         '97fe698737a35c8803712d4e08007620'
-         'acff44d97a5106d9b53c747dabeb0800'
-         '620d43a0b9f36388f423e030513864ef'
-         '4c5b1ed870363eca2602f0cb42a8415a'
-         '702c6ca31525d7d2c2ded86c77b0bd2e'
-         'ac9b3acf78f43c1395d0e2dedc860f30'
-         'd8d2c41cb86bc8ba2a07e001a5317abb'
-         '4d4af2fc06dbe33ec2307df812f7abe1'
-         '1398a566eb76598bf3005e187fc2386c'
-         'dd962d2d57f88b9e07e665adad3cabbc'
-         'fff0fc9cd16ef1eb2b2ed5d0a6e77f95'
-         'e54d41d39e63d04ac4a88ce79e37af98'
-         'dbc71403040f447683bf55d1f0be3cad'
-         '69ce5b72f44b008d0e78767c5b1dbf39'
-         '34a2e8ae6b81a042966740263c53e135'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '18f577b374d60b3c760a3a3350407632'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '185d60944ea767075d27247c3162b3bc'
-         '90401bca927835b6fbae4a707ed187c8'
-         '451ccf439a36a568653b024534669971'
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
-         '41c9b65ad60af4b3255bbecdfef11736'
-         'bbdd5639ada63e3130761daaecae1a10'
-         '23bd75552206dfcd8fd4e29137dcac84'
-         'b8cbca7b3363e6ca2d02bc0ba2b63904'
-         'b632bdd25649cc4067bcb410bae23d2b'
-         '9d60b6cfa3ef1926848710bbcd11115b'
-         'dbaafd21de055e582d92d7d32fe9da13'
-         'b7b2d0e04e142f26dd96119c80757d1f'
-         'bc228237108cab7745897a9f466b6d39'
-         'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9'
-         '3c6c62e77c30649a3dfe73512947cc9a'
-         'eb35d4c715e0dfc23bbc706996033829')
-
-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 "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-	# move all LibO sources into one build directory
-	mkdir ${srcdir}/build && cd ${srcdir}/build
-	for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations
-	  mv ${srcdir}/$i/* .
-	done
-#	mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* .
-#	./bin/unpack-sources ${srcdir}/build
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	cd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-
-	cd ${srcdir}/build
-
-	# buildfixes & bugfixes
-	#patch -Np1 -i ${srcdir}/buildfix_boost.diff
-	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
-	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-	patch -Np1 -i ${srcdir}/oracle-recognition.diff
-	patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
-	
-	# unset C(XX)FLAGS
-	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
-#	unset CFLAGS
-#	unset CXXFLAGS
-
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-	
-	# python2 fix
-	export PYTHON=python2
-
-	# http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
-
-#	if [ "$CARCH" = "x86_64" ]; then
-#	      EXTRAOPTS="--without-stlport"
-#	 else 
-#	      EXTRAOPTS="--with-stlport" # --without-system-boost"
-#	      # # avoid problems with ixion for now
-#	      sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-#	fi
-
-	# needed for 0003-distro-install-fix-en-US-only-installation.patch
-	autoconf -f
-
-	# non-SMP test build
-#	export MAKEFLAGS="-j1"
-	./configure --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" \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-cairo\
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-ldap \
-		--enable-lockdown\
-		--enable-opengl \
-		--enable-odk\
-		--enable-opengl\
-		--enable-ext-barcode \
-		--enable-ext-diagram \
-		--enable-ext-google-docs \
-		--enable-ext-hunart \
-		--disable-ext-lightproof \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-ext-nlpsolver \
-		--enable-ext-ct2n \
-		--enable-ext-numbertext \
-		--enable-ext-oooblogger \
-		--enable-ext-pdfimport \
-		--enable-ext-presenter-console \
-		--enable-ext-presenter-minimizer \
-		--enable-ext-report-builder \
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-scripting-python \
-		--enable-ext-typo \
-		--enable-ext-validator \
-		--enable-ext-watch-window \
-		--enable-ext-wiki-publisher \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--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-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--with-system-libtextcat \
-		--with-external-libtextcat-data \
-		--with-openldap\
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--with-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mozilla\
-		--with-system-mythes\
-		--with-system-xrender-headers\
-		--with-system-headers\
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS || return 1
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	unset MAKEFLAGS
-	./bootstrap
-	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=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
-          'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
-          'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
-	  #'java-runtime' 
-          #'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'
-             'hsqldb-java:      default database format for OpenOffice.org'
-             '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'
-             'libldap:          to get profiles via ldap'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/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/build/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
- 
- #	# remove version in menu entry and make it visible
-#	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-#	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
- # 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/basis3.4/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/basis3.4/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/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/build/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-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/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/build/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."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/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/build/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' 'dbus-glib')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/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/build/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."
- 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}/build/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/build/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}/build/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/build/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/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/build/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}/build/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/build/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 ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-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}/build/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/build/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/basis3.4/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- 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}/build/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/build/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}/build/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/build/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-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-	chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-#	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-#	unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-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}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-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}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/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}/build/solver/${_OFFICEUPD}/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}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-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/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-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/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-	find ${pkgdir} -type d -exec chmod 755 {} \;
-	#chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-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}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/staging/libreoffice/buildfix_boost.diff b/staging/libreoffice/buildfix_boost.diff
deleted file mode 100644
index d8608d0d4..000000000
--- a/staging/libreoffice/buildfix_boost.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 05 Apr 2011 14:07:02 +0000
-Subject: silence some more of that annoying gcc#47679
-
----
-diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
-index 1c804aa..9b33a5f 100644
---- a/boost/boost.gcc47679.patch
-+++ b/boost/boost.gcc47679.patch
-@@ -36,3 +36,26 @@
-          template <int MaxDigits>
-          inline bool allow_more_digits(std::size_t i)
-          {
-+--- misc/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-++++ misc/build/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-+@@ -31,6 +31,8 @@
-+ 
-+ #include "boost/optional/optional_fwd.hpp"
-+ 
-++#include <string.h>
-++
-+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-+ // VC6.0 has the following bug:
-+ //   When a templated assignment operator exist, an implicit conversion
-+@@ -114,6 +116,11 @@
-+ 
-+   public:
-+ 
-++    aligned_storage()
-++    {
-++      memset(&dummy_, 0, sizeof(dummy_));
-++    }
-++
-+     void const* address() const { return &dummy_.data[0]; }
-+     void      * address()       { return &dummy_.data[0]; }
-+ } ;
---
-cgit v0.8.3-6-g21f6
-
diff --git a/staging/libreoffice/buildfix_ct2n.diff b/staging/libreoffice/buildfix_ct2n.diff
deleted file mode 100644
index 979587f79..000000000
--- a/staging/libreoffice/buildfix_ct2n.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 12 Apr 2011 19:35:51 +0000
-Subject: duplicate NULLs
-
----
-diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
-index 91f44b7..714d926 100644
---- a/ct2n/prj/build.lst
-+++ b/ct2n/prj/build.lst
-@@ -1,3 +1,3 @@
--ct2n	ct2n	:	solenv NULL NULL
-+ct2n	ct2n	:	solenv NULL
- ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
- ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
---
-cgit v0.8.3-6-g21f6
diff --git a/staging/libreoffice/libreoffice.install b/staging/libreoffice/libreoffice.install
deleted file mode 100644
index 809472f89..000000000
--- a/staging/libreoffice/libreoffice.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-gtk-update-icon-cache -f -q /usr/share/icons/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
-gtk-update-icon-cache -f -q /usr/share/icons/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
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff b/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff
deleted file mode 100644
index fd61cb4ca..000000000
--- a/staging/libreoffice/scp2-more-reasonable-file-access-rights.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- scp2/inc/macros.inc.old	2011-05-18 17:51:47.000000000 +0200
-+++ scp2/inc/macros.inc	2011-07-18 19:58:27.000000000 +0200
-@@ -92,10 +92,10 @@
- #endif
- 
- #define BIN_FILE_BODY \
--        UnixRights   = 555
-+        UnixRights   = 755
- 
- #define TXT_FILE_BODY \
--        UnixRights   = 444
-+        UnixRights   = 644
- 
- #define USER_FILE_BODY \
-         UnixRights   = 644
diff --git a/staging/libreoffice/vbahelper.visibility.patch b/staging/libreoffice/vbahelper.visibility.patch
deleted file mode 100644
index 5739100d0..000000000
--- a/staging/libreoffice/vbahelper.visibility.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
-@@ -238,7 +238,7 @@
- 
- // including a HelperInterface implementation
- template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
- {
- typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
- protected:
---- sc/Library_vbaobj.mk
-+++ sc/Library_vbaobj.mk
-@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbaquerytable \
-         sc/source/ui/vba/vbarange \
-         sc/source/ui/vba/vbasheetobject \
--        sc/source/ui/vba/vbasheetobjects \
-         sc/source/ui/vba/vbastyle \
-         sc/source/ui/vba/vbastyles \
-         sc/source/ui/vba/vbatextboxshape \
-@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbawsfunction \
- ))
- 
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+        sc/source/ui/vba/vbasheetobjects \
-+        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+
- ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
- $(eval $(call gb_Library_set_ldflags,vbaobj,\
- 	$$(LDFLAGS) \
diff --git a/staging/mediastreamer/PKGBUILD b/staging/mediastreamer/PKGBUILD
deleted file mode 100644
index a82d87db1..000000000
--- a/staging/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141596 2011-10-31 15:32:28Z andrea $
-# 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.7.3
-pkgrel=4
-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' 'v4l-utils' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "disable-v4l1.patch")
-md5sums=('5213307f557d86aa648f1a53a885138c'
-         '7ee15689eed1adbdcf0ddab8fadca34a')
-options=('!libtool')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver/
-  patch -p2 -i "${srcdir}"/disable-v4l1.patch
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib/mediastreamer/
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/mediastreamer/disable-v4l1.patch b/staging/mediastreamer/disable-v4l1.patch
deleted file mode 100644
index 9f6cb84d4..000000000
--- a/staging/mediastreamer/disable-v4l1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am	2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
- 
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
- 
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in	2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in	2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- 	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- 	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- 	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
--	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- 	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- 	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- 	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@	drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD
deleted file mode 100644
index b5cd37fe6..000000000
--- a/staging/moc/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 141629 2011-11-01 00:22:20Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=moc
-pkgver=20110528
-pkgrel=4
-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 \
-        gcc-undefined-symbols.diff moc-ffmpeg.patch)
-sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
-          'a811a4ac7e049914aab528d3f06a6be6634c2720'
-          'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p0 -i ../gcc-undefined-symbols.diff
-  patch -p0 -i ../moc-ffmpeg.patch
-
-# Disabling aac to use the external ffmpeg to play them (FS#13164)
-  ./autogen.sh
-  ./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}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/moc/gcc-undefined-symbols.diff b/staging/moc/gcc-undefined-symbols.diff
deleted file mode 100644
index 09e9b8bda..000000000
--- a/staging/moc/gcc-undefined-symbols.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- decoder.c~	2011-05-08 09:28:28.077137883 +0200
-+++ decoder.c	2011-05-10 21:40:48.887941968 +0200
-@@ -259,6 +259,9 @@
- 	for (i = 0; i < plugins_num; i++)
- 		if (plugins[i].decoder->destroy)
- 			plugins[i].decoder->destroy ();
-+	for (i = 0; i < plugins_num; i++)
-+		if (plugins[i].handle)
-+                    lt_dlclose(plugins[i].handle);
- 
- 	if (lt_dlexit())
- 		logit ("lt_exit() failed: %s", lt_dlerror());
diff --git a/staging/moc/moc-ffmpeg.patch b/staging/moc/moc-ffmpeg.patch
deleted file mode 100644
index 7554ea14e..000000000
--- a/staging/moc/moc-ffmpeg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2307)
-+++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
-@@ -28,12 +28,6 @@
- #include <ffmpeg/avformat.h>
- #endif
- 
--/* libavformat's API will be changing at version 53, but at present there
-- * appears to be no guidance on what will replace the deprecated fields. */
--#ifndef FF_API_OLD_METADATA
--#define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
--#endif
--
- /* FFmpeg also likes common names, without that, our common.h and log.h
-  * would not be included. */
- #undef COMMON_H
-@@ -137,7 +131,7 @@
- 	av_read_play (data->ic);
- 	for (i = 0; i < data->ic->nb_streams; i++) {
- 		data->enc = data->ic->streams[i]->codec;
--		if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
-+		if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
- 			audio_index = i;
- 			break;
- 		}
diff --git a/staging/mpd/ChangeLog b/staging/mpd/ChangeLog
deleted file mode 100644
index 40ba5e4e7..000000000
--- a/staging/mpd/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2011-09-03 Angel Velasquez <angvp@archlinux.org>
-    * Version bump to 0.16.4
-    * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
-
-2011-06-25 Angel Velasquez <angvp@archlinux.org>
-    * Added a patch for bug with ffmpeg FS#24839 
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/staging/mpd/PKGBUILD b/staging/mpd/PKGBUILD
deleted file mode 100644
index 4a09ec315..000000000
--- a/staging/mpd/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 141592 2011-10-31 14:59:27Z bluewind $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.16.5
-pkgrel=2
-pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://mpd.wikia.com/wiki/Server"
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
-makedepends=('pkgconfig' 'doxygen')
-install=${pkgname}.install
-changelog=ChangeLog
-source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2"
-'mpd') 
-md5sums=('f7564cff12035f6a1112cce770655df7'
-         'e5669c2bff4031928531e52475addeb1')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-lastfm \
-    --enable-jack \
-    --enable-pulse \
-    --enable-documentation \
-    --disable-libwrap \
-    --disable-cue \
-    --disable-sidplay \
-    --with-systemdsystemunitdir=/lib/systemd/system
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # set our dirs in mpd.conf file
-  sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
-  sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
-  sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
-  sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
-  sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
-  sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
-  sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
-  sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
-
-  install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example"
-
-  install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd"
-  install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd}
-}
diff --git a/staging/mpd/mpd b/staging/mpd/mpd
deleted file mode 100755
index 6134e2ed4..000000000
--- a/staging/mpd/mpd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Music Player Daemon"
-    [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
-    /usr/bin/mpd /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Music Player Daemon"
-    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/mpd/mpd.install b/staging/mpd/mpd.install
deleted file mode 100644
index 885505a07..000000000
--- a/staging/mpd/mpd.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade
-  echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
-}
-
-post_upgrade() {
-  getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
-  getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
-  for dir in /var/{lib,log}/mpd; do
-    chown -R mpd:mpd "$dir" 1>/dev/null
-  done
-}
-
-post_remove() {
-  getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
-  getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
-  [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
-}
diff --git a/staging/opal/PKGBUILD b/staging/opal/PKGBUILD
deleted file mode 100644
index 6490f3deb..000000000
--- a/staging/opal/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 141594 2011-10-31 15:04:50Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-pkgname=opal
-pkgver=3.10.2
-pkgrel=3
-pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64)
-url="http://www.ekiga.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex')
-makedepends=('ffmpeg')
-options=(!makeflags)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205')
-
-build() {
-  cd "${srcdir}/opal-${pkgver}"
-  CXXFLAGS="$CXXFLAGS -fpermissive" \
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/opal-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD
deleted file mode 100644
index cd5c378bd..000000000
--- a/staging/opencv/PKGBUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# $Id: PKGBUILD 142029 2011-11-04 08:15:42Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.3.1
-pkgrel=2
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('python2-numpy: Python 2.x interface'
-            'eigen2')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
-md5sums=('827c9f8aa14384c531c73aa165f9b777')
-
-_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() {
-  install=$pkgname.install
-
-  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"
-
-  # prepare FSH-friendly dirs
-  if [ -d OpenCV ]; then
-    mv opencv/samples OpenCV/
-    rm -r opencv
-    mv OpenCV opencv
-  fi
-
-  # separate docs package; also be -R friendly
-  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
-
-  # separate samples package
-  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
-}
-
-package_opencv-docs() {
-  pkgdesc+=" (documentation)"
-  depends=()
-  optdepends=()
-  options=('docs')
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
-}
-
-package_opencv-samples() {
-  pkgdesc+=" (samples)"
-  depends=()
-  optdepends=()
-  options=()
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/opencv/opencv.install b/staging/opencv/opencv.install
deleted file mode 100644
index ae3f50d5c..000000000
--- a/staging/opencv/opencv.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	echo "  Documentation and samples are in separate packages:"
-	echo "    * opencv-docs"
-	echo "    * opencv-samples"
-}
-
-post_upgrade() {
-	post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD
deleted file mode 100644
index a07f2f24f..000000000
--- a/staging/poppler/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 142254 2011-11-07 10:16:14Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.1
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://poppler.freedesktop.org/"
-_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
-        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
-        git-fixes.patch)
-md5sums=('d30e883a27423c936ef338ce1d967e2d'
-         '9dc64c254a31e570507bdd4ad4ba629a'
-         'a73ba6515aa73cb20c480692da52c79e')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-
-  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}
-  make check
-}
-
-package_poppler() {
-  pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
-  conflicts=("poppler-qt3<${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
-}
-
-package_poppler-glib() {
-  pkgdesc="Poppler glib bindings"
-  depends=("poppler=${pkgver}" 'glib2')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
-}
-
-package_poppler-qt() {
-  pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
diff --git a/staging/poppler/git-fixes.patch b/staging/poppler/git-fixes.patch
deleted file mode 100644
index a18a31aec..000000000
--- a/staging/poppler/git-fixes.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun, 30 Oct 2011 15:02:19 +0000
-Subject: pdftocairo: Make sure beginDocument() is always called
-
-This fixes a crash when rendering only odd/even pages in a printing
-format.
----
-diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
-index e458ee5..1b67c90 100644
---- a/utils/pdftocairo.cc
-+++ b/utils/pdftocairo.cc
-@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) {
-     lastPage = firstPage;
-   }
- 
-+  // Make sure firstPage is always used so that beginDocument() is called
-+  if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1))
-+    firstPage++;
-+
-   cairoOut = new CairoOutputDev();
-   cairoOut->startDoc(doc->getXRef(), doc->getCatalog());
-   if (sz != 0)
---
-cgit v0.9.0.2-2-gbebe
-From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun, 30 Oct 2011 15:08:46 +0000
-Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable
-
-This fixes an error in my previous commit.
----
-diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
-index 1b67c90..d0d1ec6 100644
---- a/utils/pdftocairo.cc
-+++ b/utils/pdftocairo.cc
-@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) {
-   }
- 
-   // Make sure firstPage is always used so that beginDocument() is called
--  if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1))
-+  if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1))
-     firstPage++;
- 
-   cairoOut = new CairoOutputDev();
---
-cgit v0.9.0.2-2-gbebe
-From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Tue, 01 Nov 2011 08:40:53 +0000
-Subject: Fix pkg-config files
-
-We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
----
-diff --git a/configure.ac b/configure.ac
-index 3a120ca..c4f5b92 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then
-   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
- 
-   GLIB_REQUIRED=2.18
-+  AC_SUBST(GLIB_REQUIRED)
-   AC_ARG_ENABLE(poppler-glib,
- 	        AC_HELP_STRING([--disable-poppler-glib],
- 		               [Don't compile poppler glib wrapper.]),
-diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in
-index 55a2278..5fcb6f2 100644
---- a/poppler-glib-uninstalled.pc.in
-+++ b/poppler-glib-uninstalled.pc.in
-@@ -1,7 +1,7 @@
- Name: poppler-glib
- Description: GLib wrapper for poppler - uninstalled
- Version: @VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- 
- Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
- Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
-diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
-index 3264ed6..e15e669 100644
---- a/poppler-glib.pc.cmake
-+++ b/poppler-glib.pc.cmake
-@@ -6,7 +6,7 @@ includedir=${prefix}/include
- Name: poppler-glib
- Description: GLib wrapper for poppler
- Version: @POPPLER_VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- @PC_REQUIRES_PRIVATE@
- 
- Libs: -L${libdir} -lpoppler-glib
-diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in
-index 04d9bb9..9ba8978 100644
---- a/poppler-glib.pc.in
-+++ b/poppler-glib.pc.in
-@@ -6,7 +6,7 @@ includedir=@includedir@
- Name: poppler-glib
- Description: GLib wrapper for poppler
- Version: @VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- @PC_REQUIRES_PRIVATE@
- 
- Libs: -L${libdir} -lpoppler-glib
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/sox/PKGBUILD b/staging/sox/PKGBUILD
deleted file mode 100644
index 1ed22a3f1..000000000
--- a/staging/sox/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 141635 2011-11-01 02:16:15Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sox
-pkgver=14.3.2
-pkgrel=4
-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')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
-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-14.3.2-ffmpeg.patch)
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
-          '86caa6aa86a0bf7a048522114d4efd11acbbda70')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
-  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-dyn-default --with-distro="Arch Linux"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/sox/sox-14.3.2-ffmpeg.patch b/staging/sox/sox-14.3.2-ffmpeg.patch
deleted file mode 100644
index 5289b9b47..000000000
--- a/staging/sox/sox-14.3.2-ffmpeg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sox-14.3.2/src/ffmpeg.c
-===================================================================
---- sox-14.3.2.orig/src/ffmpeg.c
-+++ sox-14.3.2/src/ffmpeg.c
-@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
- 
-   if (!codec || avcodec_open(enc, codec) < 0)
-     return -1;
--  if (enc->codec_type != CODEC_TYPE_AUDIO) {
-+  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
-     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
-     return -1;
-   }
-@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
-   /* Find audio stream (FIXME: allow different stream to be selected) */
-   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
-     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
--    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-+    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-       ffmpeg->audio_index = i;
-       break;
-     }
-@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
- 
-   c = st->codec;
-   c->codec_id = codec_id;
--  c->codec_type = CODEC_TYPE_AUDIO;
-+  c->codec_type = AVMEDIA_TYPE_AUDIO;
- 
-   /* put sample parameters */
-   c->bit_rate = 256000;  /* FIXME: allow specification */
-@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
-       av_init_packet(&pkt);
-       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
-       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       pkt.stream_index = ffmpeg->audio_st->index;
-       pkt.data = ffmpeg->audio_buf_aligned;
- 
diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD
deleted file mode 100644
index c76415b48..000000000
--- a/staging/tracker/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 142275 2011-11-07 20:05:58Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.12.7
-_tver=${pkgver%.*}
-pkgrel=2
-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=('e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/tracker \
-    --disable-unit-tests \
-    --enable-libflac \
-    --enable-libvorbis
-
-  make
-}
-
-package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
-              'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
-              'libvorbis: Vorbis metadata extractor'
-              'flac: FLAC metadata extractor'
-              'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-### Split libtracker-sparql
-
-  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
-
-  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
-    "$srcdir/sparql/usr/lib/tracker-$_tver"
-
-  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
-    "$srcdir/sparql/usr/share/vala/vapi"
-
-  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv "$srcdir"/sparql/* "$pkgdir"
-}
diff --git a/staging/tracker/tracker.install b/staging/tracker/tracker.install
deleted file mode 100644
index 95114273e..000000000
--- a/staging/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/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD
deleted file mode 100644
index fd99a559d..000000000
--- a/staging/transcode/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 141640 2011-11-01 05:00:23Z eric $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.5
-pkgrel=7
-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' '!makeflags')
-source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-	transcode-1.1.5-jpeg-7.patch  transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch)
-sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977'
-          '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2'
-          '2d3bb4486394ee55540e772f134e193874e5c2b4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 < ../transcode-1.1.5-jpeg-7.patch
-  patch -p1 < ../transcode-1.1.5-mpa.patch
-  patch -p1 < ../transcode-1.1.5-ffmpeg.patch
-
- # building from here
-  ./configure --prefix=/usr \
-    --enable-sse=no --enable-sse2=no --enable-altivec=no --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 \
-    --with-libxml2-prefix=/usr \
-    --with-mjpegtools-prefix=/usr \
-    --with-imagemagick-prefix=/usr \
-    --with-libdv-includes=/usr \
-    --with-libpostproc-includes=/usr/include/libpostproc \
-    --with-ogg-prefix=/usr \
-    --with-lame-libs=/usr \
-    --with-lzo-libs=/usr/lib \
-    --with-libavcodec-prefix=/usr \
-    --with-libavcodec-includes=/usr/include \
-    --with-libavcodec-libs=/usr/lib
-
-  make
- ##############################################################################
- # this imports the latest subtitleripper sources and replaces the internal
-  mkdir contrib
-  mv "${srcdir}/subtitleripper" contrib/subrip
- # removes dependency on libppm, make it dependend on netpbm just failed, argh...
-  cd contrib/subrip
-  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 contrib/subrip
-  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/staging/transcode/transcode-1.1.5-ffmpeg.patch b/staging/transcode/transcode-1.1.5-ffmpeg.patch
deleted file mode 100644
index 86e8272e9..000000000
--- a/staging/transcode/transcode-1.1.5-ffmpeg.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: transcode-1.1.5/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.5.orig/encode/encode_lavc.c
-+++ transcode-1.1.5/encode/encode_lavc.c
-@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa
-     /* 
-      * context *transcode* (not libavcodec) defaults
-      */
--    pd->ff_vcontext.mb_qmin                 = 2;
--    pd->ff_vcontext.mb_qmax                 = 31;
-     pd->ff_vcontext.max_qdiff               = 3;
-     pd->ff_vcontext.max_b_frames            = 0;
-     pd->ff_vcontext.me_range                = 0;
-@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri
-         //  handled by transcode core
-         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-         //  handled by transcode core
--        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
--        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
-Index: transcode-1.1.5/export/aud_aux.c
-===================================================================
---- transcode-1.1.5.orig/export/aud_aux.c
-+++ transcode-1.1.5/export/aud_aux.c
-@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
-     memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
--    mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
-+    mpa_ctx.codec_type  = AVMEDIA_TYPE_AUDIO;
-     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
-     mpa_ctx.channels    = vob->dm_chan;            // channels
-     mpa_ctx.sample_rate = vob->a_rate;
-Index: transcode-1.1.5/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.5.orig/export/export_ffmpeg.c
-+++ transcode-1.1.5/export/export_ffmpeg.c
-@@ -643,8 +643,6 @@ MOD_init
- 
-     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
-     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
--    lavc_venc_context->mb_qmin            = lavc_param_mb_qmin;
--    lavc_venc_context->mb_qmax            = lavc_param_mb_qmax;
-     lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
-     lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
-     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
-Index: transcode-1.1.5/import/decode_lavc.c
-===================================================================
---- transcode-1.1.5.orig/import/decode_lavc.c
-+++ transcode-1.1.5/import/decode_lavc.c
-@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode)
- 
-       //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read);
-       do {
--	  len = avcodec_decode_video(lavc_dec_context, &picture,
--		  &got_picture, buffer+buf_len, mp4_size-buf_len);
-+          AVPacket pkt;
-+	  av_init_packet( &pkt );
-+	  pkt.data = buffer+buf_len;
-+	  pkt.size = mp4_size-buf_len;
-+	  len = avcodec_decode_video2(lavc_dec_context, &picture,
-+		  &got_picture, &pkt);
- 
- 	  if (len < 0) {
- 	      tc_log_error(__FILE__, "frame decoding failed");
-Index: transcode-1.1.5/import/probe_ffmpeg.c
-===================================================================
---- transcode-1.1.5.orig/import/probe_ffmpeg.c
-+++ transcode-1.1.5/import/probe_ffmpeg.c
-@@ -47,7 +47,7 @@ static void translate_info(const AVForma
-     for (i = 0; i < ctx->nb_streams; i++) {
-         st = ctx->streams[i];
- 
--        if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
-+        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-             info->bitrate = st->codec->bit_rate / 1000;
-             info->width = st->codec->width;
-             info->height = st->codec->height;
-@@ -65,7 +65,7 @@ static void translate_info(const AVForma
-     for (i = 0; i < ctx->nb_streams; i++) {
-         st = ctx->streams[i];
- 
--        if (st->codec->codec_type == CODEC_TYPE_AUDIO
-+        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO
-          && j < TC_MAX_AUD_TRACKS) {
-             info->track[j].format = 0x1; /* known wrong */
-             info->track[j].chan = st->codec->channels;
-Index: transcode-1.1.5/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.5.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.5/export/ffmpeg_cfg.c
-@@ -34,8 +34,6 @@ int lavc_param_vme = 4;
- //int lavc_param_vqscale = 0;
- //int lavc_param_vqmin = 2;
- //int lavc_param_vqmax = 31;
--int lavc_param_mb_qmin = 2;
--int lavc_param_mb_qmax = 31;
- int lavc_param_lmin = 2;
- int lavc_param_lmax = 31;
- int lavc_param_vqdiff = 3;
-@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={
- //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
--    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
--    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
-     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
-     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-Index: transcode-1.1.5/export/ffmpeg_cfg.h
-===================================================================
---- transcode-1.1.5.orig/export/ffmpeg_cfg.h
-+++ transcode-1.1.5/export/ffmpeg_cfg.h
-@@ -13,8 +13,6 @@ extern int lavc_param_vme;
- //extern int lavc_param_vqscale;
- //extern int lavc_param_vqmin;
- //extern int lavc_param_vqmax;
--extern int lavc_param_mb_qmin;
--extern int lavc_param_mb_qmax;
- extern int lavc_param_lmin;
- extern int lavc_param_lmax;
- extern int lavc_param_vqdiff;
diff --git a/staging/transcode/transcode-1.1.5-jpeg-7.patch b/staging/transcode/transcode-1.1.5-jpeg-7.patch
deleted file mode 100644
index 288932a61..000000000
--- a/staging/transcode/transcode-1.1.5-jpeg-7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=294488
-
-Patch by: Salah Coronya
-
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
---- export/export_jpg.c
-+++ export/export_jpg.c
-@@ -91,6 +91,7 @@
- 
-   jpeg_set_quality(&encinfo, quality, TRUE);
-   encinfo.raw_data_in = TRUE;
-+  encinfo.do_fancy_downsampling = FALSE;
-   encinfo.in_color_space = JCS_YCbCr;
- 
-   encinfo.comp_info[0].h_samp_factor = 2;
diff --git a/staging/transcode/transcode-1.1.5-mpa.patch b/staging/transcode/transcode-1.1.5-mpa.patch
deleted file mode 100644
index e7fb0fc1c..000000000
--- a/staging/transcode/transcode-1.1.5-mpa.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- transcode-1.1.5-old/export/aud_aux.c	2010-07-04 12:44:31.867550180 -0500
-+++ transcode-1.1.5/export/aud_aux.c	2010-07-04 13:41:01.253292529 -0500
-@@ -347,6 +347,7 @@
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
-     memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
-+    mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
-     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
-     mpa_ctx.channels    = vob->dm_chan;            // channels
-     mpa_ctx.sample_rate = vob->a_rate;
diff --git a/staging/tumbler/PKGBUILD b/staging/tumbler/PKGBUILD
deleted file mode 100644
index f4be09220..000000000
--- a/staging/tumbler/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 142309 2011-11-08 07:29:50Z eric $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan Jezek <honzin.jezek@gmail.com>
-
-pkgname=tumbler
-pkgver=0.1.22
-pkgrel=4
-pkgdesc="D-Bus service for applications to request thumbnails"
-url="http://git.xfce.org/xfce/tumbler/"
-license=('GPL2' 'LGPL')
-arch=('i686' 'x86_64')
-groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'bzip2' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
-optdepends=('ffmpegthumbnailer:	for video thumbnails'
-            'gstreamer0.10: for video thumbnails')
-options=('!libtool')
-source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        fix-video-image.patch)
-md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9'
-         'be9b0f1c3a4b0be102774c84d5ac29e6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../fix-video-image.patch
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/xfce4 \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/tumbler/fix-video-image.patch b/staging/tumbler/fix-video-image.patch
deleted file mode 100644
index 11c9d867b..000000000
--- a/staging/tumbler/fix-video-image.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From aab140d868c1ebedbb04bbd65deddf94dc21787b Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis@xfce.org>
-Date: Mon, 26 Sep 2011 17:28:51 +0000
-Subject: Fix generation of video images by starting the pipeline (bug #7996).
-
-Patch provided by Sam Thursfield<ssssam@gmail.com>.
----
-diff --git a/NEWS b/NEWS
-index 0ff1c1c..48e3896 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,7 @@
-+0.1.xx
-+======
-+- Fix generation of video images by starting the pipeline (bug #7996).
-+
- 0.1.22
- ======
- - Add coding style documentation.
-diff --git a/plugins/gst-thumbnailer/gst-helper.c b/plugins/gst-thumbnailer/gst-helper.c
-index b8a29ab..dead043 100644
---- a/plugins/gst-thumbnailer/gst-helper.c
-+++ b/plugins/gst-thumbnailer/gst-helper.c
-@@ -154,6 +154,8 @@ gst_helper_convert_buffer_to_pixbuf (GstBuffer    *buffer,
- 
-   bus = gst_element_get_bus (GST_ELEMENT (pipeline));
- 
-+  gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
-+
-   i = 0;
-   msg = NULL;
-   while (msg == NULL && i < 5)
---
-cgit 
diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD
deleted file mode 100644
index 4dd8a70b3..000000000
--- a/staging/vlc/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 141742 2011-11-02 17:18:59Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=1.1.12
-pkgrel=2
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libpulse: PulseAudio support'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/http/.hosts'
-        'usr/share/vlc/http/dialogs/.hosts'
-        'usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('91de1ad308c947e35380f9d747ff5713')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-faad \
-              --enable-v4l \
-              --enable-snapshot \
-              --enable-dbus-control \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --with-live555-tree=/usr/lib/live \
-              --enable-upnp \
-              --enable-realrtsp
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}
diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install
deleted file mode 100644
index 4a1091bc5..000000000
--- a/staging/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/staging/x264/PKGBUILD b/staging/x264/PKGBUILD
deleted file mode 100644
index 542a23528..000000000
--- a/staging/x264/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141584 2011-10-31 13:05:32Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=x264
-pkgver=20111030
-pkgrel=1
-pkgdesc="free library for encoding H264/AVC video streams"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/x264.html"
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc')
-
-build() {
-    cd "$srcdir/$pkgname-snapshot-$pkgver-2245"
-
-    ./configure --enable-shared
-
-    make
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD
deleted file mode 100644
index 325dc8456..000000000
--- a/staging/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 141637 2011-11-01 02:51:18Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.1.19
-pkgrel=6
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
-             'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
-optdepends=('imagemagick: for using the imagemagick plugin' \
-            'smbclient: for using the smb plugin' \
-            'jack: for using the jack plugin' \
-            'vcdimager: for using the vcd plugin' \
-            'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
-            'mesa: for using the opengl plugin' \
-            'libpulse: for using the pulseaudio plugin' \
-            'speex: for using the speex plugin' \
-            'v4l-utils: for using the v4l 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')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
-        xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch
-        xine-lib-1.1.19-ffmpeg.patch)
-sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d'
-          '121a8358d7919b2e51067412373f52848290338a'
-          '920bf27e6e3523dfe4cc9c802ff713e9688a3f34'
-          'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch"
-  patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch"
-  patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch"
-  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
-    configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
-
-  libtoolize --force --copy
-  aclocal -I m4
-  autoconf
-  automake --add-missing
-
-  ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
deleted file mode 100644
index 4b6ba9e35..000000000
--- a/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
-+++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
-@@ -161,10 +161,6 @@
-                   ;;
- 
-               esac
--              if test x"$archopt_val" != x; then
--                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--              fi
-             fi
-           else
-             dnl we have the Intel compiler
diff --git a/staging/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/staging/xine-lib/xine-lib-1.1.19-ffmpeg.patch
deleted file mode 100644
index 6817aa989..000000000
--- a/staging/xine-lib/xine-lib-1.1.19-ffmpeg.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c
---- a/src/combined/ffmpeg/ff_audio_decoder.c	Mon May 16 15:49:02 2011 +0100
-+++ b/src/combined/ffmpeg/ff_audio_decoder.c	Mon May 16 19:46:49 2011 -0400
-@@ -46,6 +46,12 @@
- 
- #define AUDIOBUFSIZE (64 * 1024)
- 
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+#  define AVAUDIO 3
-+#else
-+#  define AVAUDIO 2
-+#endif
-+
- typedef struct {
-   audio_decoder_class_t   decoder_class;
- } ff_audio_class_t;
-@@ -255,6 +261,9 @@
-       buf->decoder_info[2]);
- 
-   } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
-+#if AVAUDIO > 2
-+    AVPacket avpkt;
-+#endif
- 
-     if( !this->decoder_ok ) {
-       if ( ! this->context || ! this->codec ) {
-@@ -286,11 +295,21 @@
-     if (!this->output_open) {
-       if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
-         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+#if AVAUDIO > 2
-+	av_init_packet (&avpkt);
-+	avpkt.data = (uint8_t *)&this->buf[0];
-+	avpkt.size = this->size;
-+	avpkt.flags = AV_PKT_FLAG_KEY;
-+	avcodec_decode_audio3 (this->context,
-+			       (int16_t *)this->decode_buffer,
-+			       &decode_buffer_size, &avpkt);
-+#else
-         avcodec_decode_audio2 (this->context,
-                               (int16_t *)this->decode_buffer,
-                               &decode_buffer_size,
-                               &this->buf[0],
-                               this->size);
-+#endif
- 	this->audio_bits = this->context->bits_per_sample;
- 	this->audio_sample_rate = this->context->sample_rate;
- 	this->audio_channels = this->context->channels;
-@@ -311,12 +330,21 @@
-       offset = 0;
-       while (this->size>0) {
-         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+#if AVAUDIO > 2
-+	av_init_packet (&avpkt);
-+	avpkt.data = (uint8_t *)&this->buf[offset];
-+	avpkt.size = this->size;
-+	avpkt.flags = AV_PKT_FLAG_KEY;
-+	bytes_consumed = avcodec_decode_audio3 (this->context,
-+						(int16_t *)this->decode_buffer,
-+						&decode_buffer_size, &avpkt);
-+#else
-         bytes_consumed = avcodec_decode_audio2 (this->context,
-                                                (int16_t *)this->decode_buffer,
-                                                &decode_buffer_size,
-                                                &this->buf[offset],
-                                                this->size);
--
-+#endif
-         if (bytes_consumed<0) {
-           xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                    "ffmpeg_audio_dec: error decompressing audio frame\n");
-diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c
---- a/src/combined/ffmpeg/ff_video_decoder.c	Mon May 16 15:49:02 2011 +0100
-+++ b/src/combined/ffmpeg/ff_video_decoder.c	Mon May 16 19:46:49 2011 -0400
-@@ -58,6 +58,14 @@
- 
- #define ENABLE_DIRECT_RENDERING
- 
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+#  define AVVIDEO 2
-+#else
-+#  define AVVIDEO 1
-+#  define pp_context	pp_context_t
-+#  define pp_mode	pp_mode_t
-+#endif
-+
- /* reordered_opaque appeared in libavcodec 51.68.0 */
- #define AVCODEC_HAS_REORDERED_OPAQUE
- #if LIBAVCODEC_VERSION_INT < 0x334400
-@@ -116,8 +124,8 @@
- 
-   int               pp_quality;
-   int               pp_flags;
--  pp_context_t     *pp_context;
--  pp_mode_t        *pp_mode;
-+  pp_context       *our_context;
-+  pp_mode          *our_mode;
- 
-   /* mpeg-es parsing */
-   mpeg_parser_t    *mpeg_parser;
-@@ -444,23 +452,23 @@
-   this->pp_quality = this->class->pp_quality;
- 
-   if(this->pp_available && this->pp_quality) {
--    if(!this->pp_context && this->context)
--      this->pp_context = pp_get_context(this->context->width, this->context->height,
-+    if(!this->our_context && this->context)
-+      this->our_context = pp_get_context(this->context->width, this->context->height,
-                                         this->pp_flags);
--    if(this->pp_mode)
--      pp_free_mode(this->pp_mode);
-+    if(this->our_mode)
-+      pp_free_mode(this->our_mode);
- 
--    this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
-+    this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
-                                                     this->pp_quality);
-   } else {
--    if(this->pp_mode) {
--      pp_free_mode(this->pp_mode);
--      this->pp_mode = NULL;
-+    if(this->our_mode) {
-+      pp_free_mode(this->our_mode);
-+      this->our_mode = NULL;
-     }
- 
--    if(this->pp_context) {
--      pp_free_context(this->pp_context);
--      this->pp_context = NULL;
-+    if(this->our_context) {
-+      pp_free_context(this->our_context);
-+      this->our_context = NULL;
-     }
-   }
- }
-@@ -1055,12 +1063,26 @@
-     }
- 
-     /* skip decoding b frames if too late */
-+#if AVVIDEO > 1
-+    this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
-+#else
-     this->context->hurry_up = (this->skipframes > 0);
-+#endif
- 
-     lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
-+#if AVVIDEO > 1
-+    AVPacket avpkt;
-+    av_init_packet(&avpkt);
-+    avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
-+    avpkt.size = this->mpeg_parser->buffer_size;
-+    avpkt.flags = AV_PKT_FLAG_KEY;
-+    len = avcodec_decode_video2 (this->context, this->av_frame,
-+				 &got_picture, &avpkt);
-+#else
-     len = avcodec_decode_video (this->context, this->av_frame,
-                                 &got_picture, this->mpeg_parser->chunk_buffer,
-                                 this->mpeg_parser->buffer_size);
-+#endif
-     lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
-             len, got_picture);
-     len = current - buf->content - offset;
-@@ -1112,7 +1134,13 @@
- 
-     } else {
- 
--      if (this->context->hurry_up) {
-+      if (
-+#if AVVIDEO > 1
-+	  this->context->skip_frame != AVDISCARD_DEFAULT
-+#else
-+	  this->context->hurry_up
-+#endif
-+	 ) {
-         /* skipped frame, output a bad frame */
-         img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                   this->bih.biWidth,
-@@ -1304,13 +1332,25 @@
-         got_picture = 0;
-       } else {
-         /* skip decoding b frames if too late */
-+#if AVVIDEO > 1
-+	this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
-+#else
-         this->context->hurry_up = (this->skipframes > 0);
--
-+#endif
-         lprintf("buffer size: %d\n", this->size);
-+#if AVVIDEO > 1
-+	AVPacket avpkt;
-+	av_init_packet(&avpkt);
-+	avpkt.data = (uint8_t *)&chunk_buf[offset];
-+	avpkt.size = this->size;
-+	avpkt.flags = AV_PKT_FLAG_KEY;
-+	len = avcodec_decode_video2 (this->context, this->av_frame,
-+				     &got_picture, &avpkt);
-+#else
-         len = avcodec_decode_video (this->context, this->av_frame,
-                                     &got_picture, &chunk_buf[offset],
-                                     this->size);
--
-+#endif
- #ifdef AVCODEC_HAS_REORDERED_OPAQUE
-         /* reset consumed pts value */
-         this->context->reordered_opaque = ff_tag_pts(this, 0);
-@@ -1432,7 +1472,7 @@
-                         img->base, img->pitches,
-                         img->width, img->height,
-                         this->av_frame->qscale_table, this->av_frame->qstride,
--                        this->pp_mode, this->pp_context,
-+                        this->our_mode, this->our_context,
-                         this->av_frame->pict_type);
- 
-         } else if (!this->av_frame->opaque) {
-@@ -1676,11 +1716,11 @@
-     free(this->buf);
-   this->buf = NULL;
- 
--  if(this->pp_context)
--    pp_free_context(this->pp_context);
-+  if(this->our_context)
-+    pp_free_context(this->our_context);
- 
--  if(this->pp_mode)
--    pp_free_mode(this->pp_mode);
-+  if(this->our_mode)
-+    pp_free_mode(this->our_mode);
- 
-   mpeg_parser_dispose(this->mpeg_parser);
- 
-@@ -1721,8 +1761,8 @@
-   this->aspect_ratio      = 0;
- 
-   this->pp_quality        = 0;
--  this->pp_context        = NULL;
--  this->pp_mode           = NULL;
-+  this->our_context       = NULL;
-+  this->our_mode          = NULL;
- 
-   this->mpeg_parser       = NULL;
- 
-diff -r 717450d734f7 src/post/planar/pp.c
---- a/src/post/planar/pp.c	Mon May 16 15:49:02 2011 +0100
-+++ b/src/post/planar/pp.c	Mon May 16 19:46:49 2011 -0400
-@@ -35,6 +35,12 @@
- #  include <libpostproc/postprocess.h>
- #endif
- 
-+#if LIBPOSTPROC_VERSION_MAJOR < 52
-+#  define pp_context	pp_context_t
-+#  define pp_mode	pp_mode_t
-+#  define PP_PARAMETERS_T
-+#endif
-+
- #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */
- 
- /* plugin class initialization function */
-@@ -76,14 +82,15 @@
- 
-   /* libpostproc specific stuff */
-   int                pp_flags;
--  pp_context_t      *pp_context;
--  pp_mode_t         *pp_mode;
-+  pp_context        *our_context;
-+  pp_mode           *our_mode;
- 
-   pthread_mutex_t    lock;
- };
- 
- 
- static int set_parameters (xine_post_t *this_gen, void *param_gen) {
-+#ifdef PP_PARAMETERS_T
-   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
-   pp_parameters_t *param = (pp_parameters_t *)param_gen;
- 
-@@ -92,17 +99,18 @@
-   memcpy( &this->params, param, sizeof(pp_parameters_t) );
- 
-   pthread_mutex_unlock (&this->lock);
--
-+#endif
-   return 1;
- }
- 
- static int get_parameters (xine_post_t *this_gen, void *param_gen) {
-+#ifdef PP_PARAMETERS_T
-   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
-   pp_parameters_t *param = (pp_parameters_t *)param_gen;
- 
- 
-   memcpy( param, &this->params, sizeof(pp_parameters_t) );
--
-+#endif
-   return 1;
- }
- 
-@@ -202,8 +210,8 @@
-   if(cpu_caps & MM_ACCEL_X86_3DNOW)
-     this->pp_flags |= PP_CPU_CAPS_3DNOW;
- 
--  this->pp_mode = NULL;
--  this->pp_context = NULL;
-+  this->our_mode = NULL;
-+  this->our_context = NULL;
- 
-   pthread_mutex_init (&this->lock, NULL);
- 
-@@ -248,13 +256,13 @@
-   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
- 
-   if (_x_post_dispose(this_gen)) {
--    if(this->pp_mode) {
--      pp_free_mode(this->pp_mode);
--      this->pp_mode = NULL;
-+    if(this->our_mode) {
-+      pp_free_mode(this->our_mode);
-+      this->our_mode = NULL;
-     }
--    if(this->pp_context) {
--      pp_free_context(this->pp_context);
--      this->pp_context = NULL;
-+    if(this->our_context) {
-+      pp_free_context(this->our_context);
-+      this->our_context = NULL;
-     }
-     free(this);
-   }
-@@ -304,7 +312,7 @@
- 
-     pthread_mutex_lock (&this->lock);
- 
--    if( !this->pp_context ||
-+    if( !this->our_context ||
-         this->frame_width != yv12_frame->width ||
-         this->frame_height != yv12_frame->height ) {
- 
-@@ -312,32 +320,32 @@
-       this->frame_height = yv12_frame->height;
-       pp_flags = this->pp_flags;
- 
--      if(this->pp_context)
--        pp_free_context(this->pp_context);
-+      if(this->our_context)
-+        pp_free_context(this->our_context);
- 
--      this->pp_context = pp_get_context(frame->width, frame->height, pp_flags);
-+      this->our_context = pp_get_context(frame->width, frame->height, pp_flags);
- 
--      if(this->pp_mode) {
--        pp_free_mode(this->pp_mode);
--        this->pp_mode = NULL;
-+      if(this->our_mode) {
-+        pp_free_mode(this->our_mode);
-+        this->our_mode = NULL;
-       }
-     }
- 
--    if(!this->pp_mode)
--      this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode,
-+    if(!this->our_mode)
-+      this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode,
-                                                       this->params.quality);
- 
--    if(this->pp_mode)
-+    if(this->our_mode)
-       pp_postprocess(yv12_frame->base, yv12_frame->pitches,
-                      out_frame->base, out_frame->pitches,
-                      (frame->width+7)&(~7), frame->height,
-                      NULL, 0,
--                     this->pp_mode, this->pp_context,
-+                     this->our_mode, this->our_context,
-                      0 /*this->av_frame->pict_type*/);
- 
-     pthread_mutex_unlock (&this->lock);
- 
--    if(this->pp_mode) {
-+    if(this->our_mode) {
-       skip = out_frame->draw(out_frame, stream);
-       _x_post_frame_copy_up(frame, out_frame);
-     } else {
diff --git a/staging/xine-lib/xine-lib-1.1.19-xvmc.patch b/staging/xine-lib/xine-lib-1.1.19-xvmc.patch
deleted file mode 100644
index bef8b0bac..000000000
--- a/staging/xine-lib/xine-lib-1.1.19-xvmc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Quoting ChangeLog of X11's videoproto package:
-vldXvMC.h: stop uselessly including XvMClib.h
-
---- src/video_out/xxmc.h
-+++ src/video_out/xxmc.h
-@@ -77,10 +77,10 @@
- #include <X11/extensions/XShm.h>
- #include <X11/extensions/Xv.h>
- #include <X11/extensions/Xvlib.h>
-+#include <X11/extensions/XvMClib.h>
- #ifdef HAVE_VLDXVMC
-   #include <X11/extensions/vldXvMC.h>
- #else
--  #include <X11/extensions/XvMClib.h>
-   #include <X11/extensions/XvMC.h>
- #endif
- 
diff --git a/testing/alsa-plugins/PKGBUILD b/testing/alsa-plugins/PKGBUILD
deleted file mode 100644
index d99886d38..000000000
--- a/testing/alsa-plugins/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 142131 2011-11-05 11:37:29Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Daniel Ehlers <danielehlers@mindeye.net>
-
-pkgname=alsa-plugins
-pkgver=1.0.24
-pkgrel=3
-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")
-md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
-}
diff --git a/testing/amarok/PKGBUILD b/testing/amarok/PKGBUILD
deleted file mode 100644
index 7de2e8563..000000000
--- a/testing/amarok/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 142133 2011-11-05 11:37:31Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.3
-pkgrel=2
-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")
-md5sums=('24e8141bcbd065448911fa872c50197d')
-
-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/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/arora/PKGBUILD b/testing/arora/PKGBUILD
deleted file mode 100644
index 453690ba9..000000000
--- a/testing/arora/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 141144 2011-10-24 20:29:56Z andrea $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=arora
-pkgver=0.11.0
-pkgrel=3
-pkgdesc='Lightweight cross-platform Web browser'
-url='http://www.arora-browser.org'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qtwebkit' 'desktop-file-utils')
-source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	qmake PREFIX="/usr" "CONFIG-=debug" -r
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/testing/arora/install b/testing/arora/install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/arora/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/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD
deleted file mode 100644
index 1878008b1..000000000
--- a/testing/avidemux/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 142119 2011-11-05 11:37:15Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.5
-pkgrel=5
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
-        avidemux-2.5.4-x264-build115.patch)
-md5sums=('33bbe210c6826cea1987ed18a41d57a7'
-         '24a18b53a58b678b9e87d30566985751')
-
-build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-
-  patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch"
-
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
-  make
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-  mkdir -p lib
-  cd lib
-  find ../avidemux -name '*.so*' | xargs ln -sft .
-  cd ../../plugins
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
-    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
-    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
-    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
-  make
-}
-
-package_avidemux-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faac: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux')
-  conflicts=('avidemux')
-  replaces=('avidemux')
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/avidemux
-  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
-  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
-
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
-
-  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
-
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-}
-
-package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -d "${pkgdir}/usr/share/avidemux/i18n"
-  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-}
diff --git a/testing/avidemux/avidemux-2.5.4-x264-build115.patch b/testing/avidemux/avidemux-2.5.4-x264-build115.patch
deleted file mode 100644
index c627667ec..000000000
--- a/testing/avidemux/avidemux-2.5.4-x264-build115.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +0200
-@@ -488,8 +488,10 @@
- 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
- 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
- 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
- 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +0200
-@@ -417,7 +417,7 @@
- 	_param.b_cabac = cabac;
- }
- 
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
- 	return _param.i_open_gop;
-@@ -428,6 +428,17 @@
- 	if (openGopMode < 3)
- 		_param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114
-+unsigned int x264Options::getOpenGopMode(void)
-+{
-+        return _param.b_open_gop;
-+}
-+ 
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+        if (openGopMode < 3)
-+                _param.b_open_gop = openGopMode;
-+}
- #endif
- 
- unsigned int x264Options::getInterlaced(void)
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/avidemux/avidemux.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD
deleted file mode 100644
index 3e3ba3663..000000000
--- a/testing/bash/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 141911 2011-11-03 05:56:41Z allan $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=bash
-_basever=4.2
-_patchlevel=010 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=2
-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'
-         'fe5d3a367f7d5f754214dc05e3d958ab'
-         '472f536d7c9e8250dc4568ec4cfaf294'
-         '1100bc1dda2cdc06ac44d7e5d17864a3'
-         'a7184b76eb4a079f10174a0a8f574819'
-         '30e7948079921d3261efcc6a40722135'
-         'c4d45307f7e69fe508ce347c4cec1955'
-         '9ea06decec43a198f3d7cf29acc602f8'
-         '74bddae6eeb9227a04a467d42597a34d'
-         'fb48f6134d7b013135929476aa0c250c'
-         '3e6a18226b16c773229246abd07a1f5e'
-         'e70e45de33426b38153b390be0dbbcd4'
-         'e667dc9348ebc3e0e14bfdd87f4b6ff2'
-         'ce4e5c484993705b27daa151eca242c2'
-         '41cbd8e57589bc081a546a014ddb12f8'
-         '88d1f96db29461767602e2546803bda7'
-         'b8b781520f4c7493a2a1ac3010a44a44'
-         '24c574bf6d6a581e300823d9c1276af6'
-         '354a0899a7c4b446454c52546562b55b'
-         '4c5835f2fbab36c4292bb334977e5b6d'
-         'ff4547ca7b508d52101729d61f5b77b6'
-         '0a51602b535ef661ee707be6c8bdb373'
-         'cec7c92a4d8052ea4b29216365d16566')
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 84de2898c..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 /etc/bash_completion   ] && . /etc/bash_completion
diff --git a/testing/bin86/PKGBUILD b/testing/bin86/PKGBUILD
deleted file mode 100644
index f5807147b..000000000
--- a/testing/bin86/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 141728 2011-11-02 15:44:38Z dreisner $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=bin86
-pkgver=0.16.18
-pkgrel=2
-pkgdesc="A complete 8086 assembler and loader"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.debath.co.uk/"
-depends=('glibc')
-source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz"
-        bin86-0.16.17-x86_64-1.patch)
-md5sums=('914068fb649b93642d1cf21857b75699'
-         '92bdce7b0655cd2e9f83c83fc56d128e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  if [[ $CARCH = x86_64 ]]; then
-     patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
-  fi
-
-  make PREFIX=/usr
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
-  make "PREFIX=$pkgdir/usr" "MANDIR=$pkgdir/usr/share/man/man1" install
-}
diff --git a/testing/bin86/bin86-0.16.17-x86_64-1.patch b/testing/bin86/bin86-0.16.17-x86_64-1.patch
deleted file mode 100644
index 152413ee7..000000000
--- a/testing/bin86/bin86-0.16.17-x86_64-1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net>
-Date: 2005-06-28
-Initial Package Version: 0.16.14
-Upstream Status: Submitted Upstream
-Origin: from ROCK Linux
-Description: Allows bin86 to compile on x86_64, which permits lilo to
- be used in a 64-bit system.  I'm dubious about ROCK's attempts to
- automatically add dual-licensing to all their patches, but bin86 is
- already GPL'd.  I've heard from the maintainer that this will be
- included in the next upload.
-
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
---- bin86-0.16.14-orig/ld/x86_aout.h	2004-11-07 20:07:31.506442000 +0100
-+++ bin86-0.16.14/ld/x86_aout.h	2004-11-07 20:07:41.106982496 +0100
-@@ -12,6 +12,9 @@
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
- #define __OUT_OK 1
-+#elif defined(__x86_64__)
-+typedef int Long;
-+#define __OUT_OK 1
- #else
- typedef char Long[4];
- #endif
diff --git a/testing/bison/ChangeLog b/testing/bison/ChangeLog
deleted file mode 100644
index 5bb22be1d..000000000
--- a/testing/bison/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-2010-03-25  Eric Belanger  <eric@archlinux.org>
-
-	* bison 2.4.2-1
-	* Upstream update
-	* Removed texinfo dependency in install scriptlet
-	* Updated license
-	* Added sh depends
-
-2008-12-11  Eric Belanger  <eric@archlinux.org>
-
-	* bison 2.4.1-1
-	* Upstream update
-
-2008-11-08  Eric Belanger  <eric@archlinux.org>
-
-	* bison 2.4-1
-	* Upstream update
-	* Added info file support
-	* Added ChangeLog
diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD
deleted file mode 100644
index 51af7528f..000000000
--- a/testing/bison/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 141913 2011-11-03 06:08:40Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-
-pkgname=bison
-pkgver=2.5
-pkgrel=2
-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.bz2{,.sig})
-md5sums=('9dba20116b13fc61a0846b0058fbe004'
-         '610b73db67bd4760209458efe7554ca3')
-
-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/blender/PKGBUILD b/testing/blender/PKGBUILD
deleted file mode 100644
index d23728377..000000000
--- a/testing/blender/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id: PKGBUILD 142137 2011-11-05 11:37:38Z ibiru $
-# Contributor: John Sowiak <john@archlinux.org>
-# Maintainer: tobias <tobias@archlinux.org>
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.60a
-pkgrel=2
-epoch=3
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' 'libsndfile' 'ffmpeg')
-makedepends=('cmake')
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6')
-else
-  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
-  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=38016
-  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir build
-  cd build
-
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
-
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
-    -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=OFF \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
-    -DWITH_BUILTIN_GLEW:BOOL=OFF \
-    -DWITH_CODEC_FFMPEG:BOOL=ON \
-    -DWITH_CODEC_SNDFILE:BOOL=ON \
-    -DPYTHON_VERSION:STRING=3.2 \
-    -DPYTHON_LIBPATH:STRING=/usr/lib \
-    -DPYTHON_LIBRARY:STRING=python3.2mu \
-    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-    $ENABLESSE2
-
-  make $MAKEFLAGS
-
-  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
-    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
-  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
-  chmod 755 bmake
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="${pkgdir}" install
-  python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
diff --git a/testing/blender/blender.install b/testing/blender/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/testing/blender/blender.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/btrfs-progs-unstable/PKGBUILD b/testing/btrfs-progs-unstable/PKGBUILD
deleted file mode 100644
index 06c6cd776..000000000
--- a/testing/btrfs-progs-unstable/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 141708 2011-11-02 12:41:54Z tomegun $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=btrfs-progs-unstable
-pkgver=0.19.20101006
-pkgrel=2
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2)
-url="http://btrfs.wiki.kernel.org/"
-license=('GPL2')
-
-build() {
-   cd $srcdir/$pkgname
-   make CFLAGS="$CFLAGS" all convert
-}
-
-package() {
-   cd $srcdir/$pkgname
-   make prefix=$pkgdir/usr bindir=$pkgdir/sbin install
-   # fix manpage
-   mkdir -p $pkgdir/usr/share/
-   mv $pkgdir/usr/man $pkgdir/usr/share/man
-}
-md5sums=('6bce610ed1720e6b9dc9fa96cbd8b73e')
diff --git a/testing/btrfs-progs-unstable/btrfs-progs-build-fixes.patch b/testing/btrfs-progs-unstable/btrfs-progs-build-fixes.patch
deleted file mode 100644
index d189c5a77..000000000
--- a/testing/btrfs-progs-unstable/btrfs-progs-build-fixes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- btrfs-progs-0.19/btrfsck.c	
-+++ btrfs-progs-0.19/btrfsck.c	
-@@ -21,6 +21,9 @@ 
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"
---- btrfs-progs-0.19/mkfs.c	
-+++ btrfs-progs-0.19/mkfs.c	
-@@ -341,7 +341,7 @@ int main(int ac, char **av)
- 	u64 alloc_start = 0;
- 	u64 metadata_profile = BTRFS_BLOCK_GROUP_RAID1 | BTRFS_BLOCK_GROUP_DUP;
- 	u64 data_profile = BTRFS_BLOCK_GROUP_RAID0;
--	u32 leafsize = getpagesize();
-+	u32 leafsize = sysconf(_SC_PAGESIZE);
- 	u32 sectorsize = 4096;
- 	u32 nodesize = leafsize;
- 	u32 stripesize = 4096;
-@@ -398,7 +398,7 @@ int main(int ac, char **av)
- 				print_usage();
- 		}
- 	}
--	sectorsize = max(sectorsize, (u32)getpagesize());
-+	sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE));
- 	if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) {
- 		fprintf(stderr, "Illegal leafsize %u\n", leafsize);
- 		exit(1);
diff --git a/testing/bzip2/PKGBUILD b/testing/bzip2/PKGBUILD
deleted file mode 100644
index 7a1b27f94..000000000
--- a/testing/bzip2/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 141996 2011-11-03 21:01:23Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Judd <jvinet@zeroflux.org> 
-
-pkgname=bzip2
-pkgver=1.0.6
-pkgrel=3
-pkgdesc="A high-quality data compression program"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://sources.redhat.com/bzip2"
-groups=('base')
-depends=('glibc')
-source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz
-        bzip2-1.0.4-bzip2recover.patch)
-sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002'
-          '85ce76fdb67f52f152bba368c1de81132dcdbdb5')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # add large-file support
-  sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so
-
-  # use our optimization
-  sed -i "s|-O2|${CFLAGS}|g" Makefile
-  sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so
-
-  patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch
-
-  make -f Makefile-libbz2_so
-  make bzip2 bzip2recover libbz2.a
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make test
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -dm755 $pkgdir/bin
-  install -m755 bzip2-shared $pkgdir/bin/bzip2
-  install -m755 bzip2recover $pkgdir/bin
-  ln -sf bzip2 $pkgdir/bin/bunzip2
-  ln -sf bzip2 $pkgdir/bin/bzcat
-
-  install -dm755 $pkgdir/usr/bin
-  install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin
-
-  install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0
-
-  install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
-  ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
-
-  install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h
-
-  install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1
-  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1
-  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1
-  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1
-
-  install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \
-                 $pkgdir/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/bzip2/bzip2-1.0.4-bzip2recover.patch b/testing/bzip2/bzip2-1.0.4-bzip2recover.patch
deleted file mode 100644
index e2bfe1cc1..000000000
--- a/testing/bzip2/bzip2-1.0.4-bzip2recover.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bzip2-1.0.4/bzip2recover.c.pom	2007-01-03 03:00:55.000000000 +0100
-+++ bzip2-1.0.4/bzip2recover.c	2007-02-05 11:55:17.000000000 +0100
-@@ -309,7 +309,8 @@
-    UInt32      buffHi, buffLo, blockCRC;
-    Char*       p;
- 
--   strcpy ( progName, argv[0] );
-+   strncpy ( progName, argv[0], BZ_MAX_FILENAME-1);
-+   progName[BZ_MAX_FILENAME-1]='\0';
-    inFileName[0] = outFileName[0] = 0;
- 
-    fprintf ( stderr, 
diff --git a/testing/cmus/PKGBUILD b/testing/cmus/PKGBUILD
deleted file mode 100644
index 15cc1fd2e..000000000
--- a/testing/cmus/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 142139 2011-11-05 11:37:41Z ibiru $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=cmus
-pkgver=2.4.2
-pkgrel=2
-pkgdesc="A very feature-rich ncurses-based music player"
-arch=('i686' 'x86_64')
-url="http://cmus.sourceforge.net/"
-license=('GPL')
-depends=('ncurses')
-makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug'
-             'libvorbis' 'libpulse' 'wavpack' 'libmp4v2')
-optdepends=('alsa-lib: for ALSA output plugin support'
-            'libao: for AO output plugin support'
-            'libpulse: for PulseAudio output plugin support'
-            'ffmpeg: for ffmpeg input plugin support'
-            'libmodplug: for modplug input plugin support'
-            'faad2: for input AAC plugin support'
-            'libmad: for mp3 input plugin support'
-            'libmpcdec: for musepack input plugin support'
-            'wavpack: for wavpack input plugin support'
-            'libvorbis: for vorbis input plugin support'
-            'flac: for flac input plugin support'
-            'libmp4v2: for mp4 input plugin support')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
-md5sums=('f3ed7f14db20344ad7386aef48b98a4c')
-sha1sums=('12573e96e03435eca9b8a4aaeeb13a2da66f40a4')
-
-build() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  ./configure prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus"
-}
diff --git a/testing/cracklib/PKGBUILD b/testing/cracklib/PKGBUILD
deleted file mode 100644
index f4cd28980..000000000
--- a/testing/cracklib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141710 2011-11-02 12:48:28Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-
-pkgname=cracklib
-pkgver=2.8.18
-pkgrel=2
-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=('79053ad8bc714a44cd660cb12116211b')
-
-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 51e90cd17..000000000
--- a/testing/crda/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 141491 2011-10-30 23:13:54Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=crda
-pkgver=1.1.2
-pkgrel=1
-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' 'udev' 'iw')
-makedepends=('python-m2crypto')
-install=crda.install
-source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
-        crda.rc)
-md5sums=('5226f65aebacf94baaf820f8b4e06df4'
-         '014eef3f8655e9a130064ec6891317fc')
-                  
-build() {
-  msg "Compiling crda ..."
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
-  make crda regdbdump
-}
-
-package() {
-  # Install crda, regdbdump and udev rules
-  msg "Installing crda ..."
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # This rule automatically sets the regulatory domain when cfg80211 is loaded
-  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules
-
-  msg "Installing license ..."
-  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
-  
-  msg "Installing boot script ..."
-  install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom
-}
diff --git a/testing/crda/crda.install b/testing/crda/crda.install
deleted file mode 100644
index c18e15f71..000000000
--- a/testing/crda/crda.install
+++ /dev/null
@@ -1,18 +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 when necessary."
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package
-  # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one
-  # from wireless-regdb by the user-defined one
-  if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then
-    if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then
-      mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom
-    fi
-  fi
-}
diff --git a/testing/crda/crda.rc b/testing/crda/crda.rc
deleted file mode 100755
index 13dbd870e..000000000
--- a/testing/crda/crda.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/wireless-regdom
-
-case "$1" in
-  start)
-    if [ -n "${WIRELESS_REGDOM}" ]; then
-        stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}"
-        if iw reg set ${WIRELESS_REGDOM}; then
-            stat_done
-        else
-            stat_fail
-        fi
-    fi
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start"  
-esac
-exit 0
diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD
deleted file mode 100644
index e3c2872f5..000000000
--- a/testing/cryptsetup/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 141965 2011-11-03 18:49:44Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=cryptsetup
-pkgver=1.4.0
-pkgrel=2
-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>=2.02.85-2' 'libgcrypt' 'popt')
-conflicts=('mkinitcpio<0.7')
-options=('!libtool' '!emptydirs')
-source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
-        encrypt_hook
-	encrypt_install
-	cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch)
-sha256sums=('96d682853c8019cfeae0b21250cd2d00af42e46251807e8dbda2ff8427c2e9ed'
-            '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
-            'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573'
-            '6fa1d3172014ba3ba96f7a67acbcae7f26b24a61abb84b3917f526a54f81dd87')
-build() {
-  cd "${srcdir}"/$pkgname-${pkgver}
-  patch -p0 -i "${srcdir}"/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch
-  ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # install hook
-  install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt
-  install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt
-  # Fix pkgconfig location
-  install -d -m755 "${pkgdir}"/usr/lib
-  mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/
-}
diff --git a/testing/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch b/testing/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch
deleted file mode 100644
index f35226122..000000000
--- a/testing/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: ChangeLog
-===================================================================
---- ChangeLog	(Revision 664)
-+++ ChangeLog	(Revision 665)
-@@ -1,3 +1,6 @@
-+2011-10-27  Milan Broz  <mbroz@redhat.com>
-+	* Fix crypt_get_volume_key_size() for plain device.
-+
- 2011-10-25  Milan Broz  <mbroz@redhat.com>
- 	* Print informative message in isLuks only in verbose mode.
- 	* Version 1.4.0.
-Index: tests/api-test.c
-===================================================================
---- tests/api-test.c	(Revision 664)
-+++ tests/api-test.c	(Revision 665)
-@@ -660,6 +660,11 @@
- 
- 	FAIL_(crypt_init_by_name_and_header(&cd, CDEVICE_1, H_DEVICE),"can't init plain device by header device");
- 	OK_(crypt_init_by_name(&cd, CDEVICE_1));
-+	OK_(strcmp(cipher_mode,crypt_get_cipher_mode(cd)));
-+	OK_(strcmp(cipher,crypt_get_cipher(cd)));
-+	EQ_((int)key_size, crypt_get_volume_key_size(cd));
-+	EQ_(params.skip, crypt_get_iv_offset(cd));
-+	EQ_(params.offset, crypt_get_data_offset(cd));
- 	OK_(crypt_deactivate(cd, CDEVICE_1));
- 	crypt_free(cd);
- 
-Index: lib/setup.c
-===================================================================
---- lib/setup.c	(Revision 664)
-+++ lib/setup.c	(Revision 665)
-@@ -56,6 +56,7 @@
- 	char *plain_cipher;
- 	char *plain_cipher_mode;
- 	char *plain_uuid;
-+	unsigned int plain_key_size;
- 
- 	/* used in CRYPT_LOOPAES */
- 	struct crypt_params_loopaes loopaes_hdr;
-@@ -677,6 +678,7 @@
- 		(*cd)->plain_hdr.hash = NULL; /* no way to get this */
- 		(*cd)->plain_hdr.offset = dmd.offset;
- 		(*cd)->plain_hdr.skip = dmd.iv_offset;
-+		(*cd)->plain_key_size = dmd.vk->keylength;
- 
- 		r = crypt_parse_name_and_mode(dmd.cipher, cipher, NULL, cipher_mode);
- 		if (!r) {
-@@ -754,6 +756,7 @@
- 		return -EINVAL;
- 	}
- 
-+	cd->plain_key_size = volume_key_size;
- 	cd->volume_key = crypt_alloc_volume_key(volume_key_size, NULL);
- 	if (!cd->volume_key)
- 		return -ENOMEM;
-@@ -1516,7 +1519,7 @@
- 		}
- 
- 		r = process_key(cd, cd->plain_hdr.hash,
--				cd->volume_key->keylength,
-+				cd->plain_key_size,
- 				passphrase, passphrase_size, &vk);
- 		if (r < 0)
- 			goto out;
-@@ -1586,7 +1589,7 @@
- 			goto out;
- 
- 		r = process_key(cd, cd->plain_hdr.hash,
--				cd->volume_key->keylength,
-+				cd->plain_key_size,
- 				passphrase_read, passphrase_size_read, &vk);
- 		if (r < 0)
- 			goto out;
-@@ -1658,8 +1661,7 @@
- 		if (!name)
- 			return -EINVAL;
- 
--		if (!volume_key || !volume_key_size || !cd->volume_key ||
--			volume_key_size != cd->volume_key->keylength) {
-+		if (!volume_key || !volume_key_size || volume_key_size != cd->plain_key_size) {
- 			log_err(cd, _("Incorrect volume key specified for plain device.\n"));
- 			return -EINVAL;
- 		}
-@@ -1976,8 +1978,8 @@
- 
- int crypt_get_volume_key_size(struct crypt_device *cd)
- {
--	if (isPLAIN(cd->type) && cd->volume_key)
--		return cd->volume_key->keylength;
-+	if (isPLAIN(cd->type))
-+		return cd->plain_key_size;
- 
- 	if (isLUKS(cd->type))
- 		return cd->hdr.keyBytes;
diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook
deleted file mode 100644
index 956b18023..000000000
--- a/testing/cryptsetup/encrypt_hook
+++ /dev/null
@@ -1,148 +0,0 @@
-# vim: set ft=sh:
-# TODO this one needs some work to work with lots of different
-#       encryption schemes
-run_hook ()
-{
-    /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1
-    if [ -e "/sys/class/misc/device-mapper" ]; then
-        if [ ! -e "/dev/mapper/control" ]; then
-            mkdir /dev/mapper
-            mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |')
-        fi
-        [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
-
-        # Get keyfile if specified
-        ckeyfile="/crypto_keyfile.bin"
-        if [ "x${cryptkey}" != "x" ]; then
-            ckdev="$(echo "${cryptkey}" | cut -d: -f1)"
-            ckarg1="$(echo "${cryptkey}" | cut -d: -f2)"
-            ckarg2="$(echo "${cryptkey}" | cut -d: -f3)"
-            if poll_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} ${ckdev} /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=${ckdev} 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
-            cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)"
-            cryptname="$(echo "${cryptdevice}" | cut -d: -f2)"
-            cryptoptions="$(echo "${cryptdevice}" | cut -d: -f3)"
-        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."
-        }
-
-        OLDIFS="${IFS}"
-        IFS=","
-        for cryptopt in ${cryptoptions}; do
-            case ${cryptopt} in
-                allow-discards)
-                    echo "Enabling TRIM/discard support."
-                    cryptargs="${cryptargs} --allow-discards"
-                    ;;
-                *)
-                    echo "Encryption option '${cryptopt}' not known, ignoring." >&2
-                    ;;
-            esac
-        done
-        IFS="${OLDIFS}"
-
-        if  poll_device "${cryptdev}" ${rootdelay}; then
-            if /sbin/cryptsetup isLuks ${cryptdev} >/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 /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${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 /sbin/cryptsetup luksOpen ${cryptdev} ${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 [ $# -ne 5 ]; then
-                    err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip"
-                    err "Non-LUKS decryption not attempted..."
-                    return 1
-                fi
-                exe="/sbin/cryptsetup create ${cryptname} ${cryptdev} ${cryptargs}"
-                tmp=$(echo "${crypto}" | cut -d: -f1)
-                [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\""
-                tmp=$(echo "${crypto}" | cut -d: -f2)
-                [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\""
-                tmp=$(echo "${crypto}" | cut -d: -f3)
-                [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\""
-                tmp=$(echo "${crypto}" | cut -d: -f4)
-                [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\""
-                tmp=$(echo "${crypto}" | cut -d: -f5)
-                [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\""
-                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}
-    fi
-}
diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install
deleted file mode 100644
index 13174ec06..000000000
--- a/testing/cryptsetup/encrypt_install
+++ /dev/null
@@ -1,26 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
-    if [ -z "${CRYPTO_MODULES}" ]; then
-        MODULES=" dm-crypt $(all_modules "/crypto/") "
-    else
-        MODULES=" dm-crypt ${CRYPTO_MODULES} "
-    fi
-    FILES=""
-    SCRIPT="encrypt"
-    [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
-    [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
-    add_binary "/sbin/dmsetup"
-    add_file "/lib/udev/rules.d/10-dm.rules"
-    add_file "/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook allows for an encrypted root device.
-HELPEOF
-}
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index f9a5e3388..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 141474 2011-10-30 15:39:03Z 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.22.0
-pkgrel=4
-pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-makedepends=('perl-libwww')
-options=('!libtool')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        curlbuild.h)
-md5sums=('e8c36126d21c893f085aca233906b5cc'
-         '1b061c348b63ea3e90c3f2c3af6a08d6'
-         '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 "$srcdir/$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 "$srcdir/$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/db/PKGBUILD b/testing/db/PKGBUILD
deleted file mode 100644
index 7577ca553..000000000
--- a/testing/db/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 142046 2011-11-04 22:40:39Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=db
-pkgver=5.2.36
-pkgrel=2
-pkgdesc="The Berkeley DB embedded database system"
-arch=('i686' 'x86_64')
-url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-license=('custom')
-depends=('gcc-libs' 'sh')
-options=('!libtool')
-install=db.install
-source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('1a7997e5bcdf504a439f90d9eaed63864806ed5f')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
-  ../dist/configure --prefix=/usr --enable-compat185 \
-    --enable-shared --enable-static --enable-cxx --enable-dbm
-  make LIBSO_LIBS=-lpthread
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/docs
-  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/db/db.install b/testing/db/db.install
deleted file mode 100644
index 03b64042d..000000000
--- a/testing/db/db.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 5.1)" -lt 0 ]; then
-    echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases."
-  fi
-}
diff --git a/testing/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 04e12bff5..000000000
--- a/testing/dhcpcd/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 142451 2011-11-10 07:06:35Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Killian <tom.archlinux.org>
-# Contributor: Judd Vinet <jvinet.zeroflux.org>
-
-pkgname=dhcpcd
-pkgver=5.2.12
-pkgrel=4
-pkgdesc="RFC2131 compliant DHCP client daemon"
-url="http://roy.marples.name/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' '0001-Set-hostname-via-proc-if-file-is-available.patch' \
-	'0001-set-MTU-via-sysfs-if-file-is-available.patch')
-sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
-          'b67b9ce6a2faaca75fea356966a16be2283b7db0'
-          'ee85adac972a8172a9d9b3a1bdd46e0430301582'
-          'afbed18dc5544f7d0b81e2266b322ca12becf9a4')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # remove net-tools dep
-  patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch
-  patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch
-
-  # configure variables
-  ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
-
-  # 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
-}
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/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 e1f83a78f..000000000
--- a/testing/dialog/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 142048 2011-11-04 22:42:38Z 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_20111020
-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=('ddabc0950275db4e9cef382a862ff3b20746e843')
-
-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/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD
deleted file mode 100644
index a159d301b..000000000
--- a/testing/dnsutils/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 142025 2011-11-04 07:03:15Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: mario <mario_vazq@hotmail.com>
-
-pkgname=dnsutils
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.1
-_pkgver=9.8.1
-pkgrel=2
-
-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')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'remove-bind.patch')
-sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c'
-          'b465ef6160b004838f04de9978fe1be8422af777')
-
-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 19d650964..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 @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/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 86d97da13..000000000
--- a/testing/e2fsprogs/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 141998 2011-11-03 21:12:45Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org> 
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=e2fsprogs
-pkgver=1.41.14
-pkgrel=2
-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-ng')
-makedepends=('bc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'MIT-LICENSE')
-backup=('etc/mke2fs.conf')
-install=${pkgname}.install
-sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5'
-          '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="" --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/ed/PKGBUILD b/testing/ed/PKGBUILD
deleted file mode 100644
index 98017030d..000000000
--- a/testing/ed/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 141699 2011-11-02 12:26:32Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=ed
-pkgver=1.5
-pkgrel=4
-pkgdesc="A POSIX-compliant line-oriented text editor"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnu.org/software/ed/ed.html"
-depends=('glibc' 'sh')
-options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e66c03d7e4c67b025d5b6093ec678267')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/ \
-              --mandir=/usr/share/man \
-              --infodir=/usr/share/info \
-              "CFLAGS=$CFLAGS" \
-              "LDFLAGS=$LDFLAGS"
-
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make "DESTDIR=$pkgdir" install
-
-  # nuke info pages
-  rm -r "$pkgdir/usr/share/info"
-}
diff --git a/testing/expat/CVE-2009-3560.patch b/testing/expat/CVE-2009-3560.patch
deleted file mode 100644
index 5fe9c36c8..000000000
--- a/testing/expat/CVE-2009-3560.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c
---- trunk~/lib/xmlparse.c	2007-05-08 04:25:35.000000000 +0200
-+++ trunk/lib/xmlparse.c	2009-12-29 21:57:22.141732904 +0100
-@@ -3703,6 +3703,9 @@
-         return XML_ERROR_UNCLOSED_TOKEN;
-       case XML_TOK_PARTIAL_CHAR:
-         return XML_ERROR_PARTIAL_CHAR;
-+      case -XML_TOK_PROLOG_S:
-+        tok = -tok;
-+        break;
-       case XML_TOK_NONE:
- #ifdef XML_DTD
-         /* for internal PE NOT referenced between declarations */
diff --git a/testing/expat/CVE-2009-3720.patch b/testing/expat/CVE-2009-3720.patch
deleted file mode 100644
index 65d16431f..000000000
--- a/testing/expat/CVE-2009-3720.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c
---- trunk~/lib/xmltok_impl.c	2006-11-26 18:34:46.000000000 +0100
-+++ trunk/lib/xmltok_impl.c	2009-10-22 21:42:41.000000000 +0200
-@@ -1744,7 +1744,7 @@
-                        const char *end,
-                        POSITION *pos)
- {
--  while (ptr != end) {
-+  while (ptr < end) {
-     switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
-     case BT_LEAD ## n: \
diff --git a/testing/expat/PKGBUILD b/testing/expat/PKGBUILD
deleted file mode 100644
index eee7e94b9..000000000
--- a/testing/expat/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 141915 2011-11-03 06:22:06Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=expat
-pkgver=2.0.1
-pkgrel=7
-pkgdesc="An XML parser library"
-arch=('i686' 'x86_64')
-url="http://expat.sourceforge.net/"
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz
-        CVE-2009-3560.patch
-        CVE-2009-3720.patch)
-md5sums=('ee8b492592568805593f81f8cdf2a04c'
-         '50603cac0f03aabc7087415251f592be'
-         'f3eeb796f28945899216b815e5901996')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/CVE-2009-3560.patch
-  patch -Np1 -i $srcdir/CVE-2009-3720.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
deleted file mode 100644
index 7a777824e..000000000
--- a/testing/ffmpeg/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 142324 2011-11-08 15:16:14Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg
-pkgver=20111108
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm')
-makedepends=('yasm' 'git')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('bad7e47f6974cee62d98ce9de710076c')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ./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-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --disable-static
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/ffmpegthumbnailer/PKGBUILD b/testing/ffmpegthumbnailer/PKGBUILD
deleted file mode 100644
index 3fed7aae2..000000000
--- a/testing/ffmpegthumbnailer/PKGBUILD
+++ /dev/null
@@ -1,34 +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=2
-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')
-options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --enable-gio
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # FS#24105: Generate thumbnails in nautilus
-  install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \
-    ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop
-}
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/findutils/PKGBUILD b/testing/findutils/PKGBUILD
deleted file mode 100644
index 5ba781519..000000000
--- a/testing/findutils/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 141714 2011-11-02 12:52:59Z tpowa $
-# Maintainer:
-
-pkgname=findutils
-pkgver=4.4.2
-pkgrel=4
-pkgdesc="GNU utilities to locate files"
-arch=('i686' 'x86_64')
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'sh')
-url="http://www.gnu.org/software/findutils"
-source=(ftp://ftp.gnu.org/pub/gnu/findutils/${pkgname}-${pkgver}.tar.gz)
-install=findutils.install
-sha1sums=('e8dd88fa2cc58abffd0bfc1eddab9020231bb024')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Don't build or install locate because we use mlocate,
-  # which is a secure version of locate.
-  sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/findutils/findutils.install b/testing/findutils/findutils.install
deleted file mode 100644
index e42d782e2..000000000
--- a/testing/findutils/findutils.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(find-maint.info find.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/flex/PKGBUILD b/testing/flex/PKGBUILD
deleted file mode 100644
index 828cd9b84..000000000
--- a/testing/flex/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 141917 2011-11-03 06:31:54Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=flex
-pkgver=2.5.35
-pkgrel=5
-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 
-        flex-2.5.35-gcc44.patch
-        flex-2.5.35-hardening.patch
-        flex-2.5.35-missing-prototypes.patch
-        flex-2.5.35-sign.patch
-        lex.sh)
-md5sums=('10714e50cea54dc7a227e3eddcd44d57'
-         'e4444ef5c07db71a43280be74139bdea'
-         'de952b3ed7cc074bc8c3e6ab73634048'
-         '6b83f56b1b654c6a321cdc530a3ec68d'
-         'd87fd9e9762ba7e230d516bdcf1c8c6f'
-         'f725259ec23a9e87ee29e2ef82eda9a5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch
-  patch -Np1 -i $srcdir/flex-2.5.35-sign.patch
-
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man --infodir=/usr/share/info
-  make
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make prefix=$pkgdir/usr \
-    mandir=$pkgdir/usr/share/man \
-    infodir=$pkgdir/usr/share/info \
-    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-2.5.35-gcc44.patch b/testing/flex/flex-2.5.35-gcc44.patch
deleted file mode 100644
index 7929fc092..000000000
--- a/testing/flex/flex-2.5.35-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
---- flex-2.5.35.orig/flex.skl	2009-04-20 03:09:46.000000000 +0530
-+++ flex-2.5.35/flex.skl	2009-04-20 07:46:58.000000000 +0530
-@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
- /* begin standard C++ headers. */
- #include <iostream> 
- #include <errno.h>
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- /* end standard C++ headers. */
-diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
---- flex-2.5.35.orig/skel.c	2009-04-20 03:09:46.000000000 +0530
-+++ flex-2.5.35/skel.c	2009-04-20 07:46:40.000000000 +0530
-@@ -284,6 +284,7 @@ const char *skel[] = {
-   "/* begin standard C++ headers. */",
-   "#include <iostream> ",
-   "#include <errno.h>",
-+  "#include <cstdio>",
-   "#include <cstdlib>",
-   "#include <cstring>",
-   "/* end standard C++ headers. */",
diff --git a/testing/flex/flex-2.5.35-hardening.patch b/testing/flex/flex-2.5.35-hardening.patch
deleted file mode 100644
index 7d608ea23..000000000
--- a/testing/flex/flex-2.5.35-hardening.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
---- flex-2.5.35/scan.c
-+++ flex-2.5.35/scan.c
-@@ -2096,7 +2096,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
-  * we now use fwrite().
-  */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- #endif
- 
- /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
-diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl
-+++ flex-2.5.35/flex.skl
-@@ -1075,7 +1075,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
-  * we now use fwrite().
-  */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- %endif
- %if-c++-only C++ definition
- #define ECHO LexerOutput( yytext, yyleng )
-diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
---- flex-2.5.35/skel.c
-+++ flex-2.5.35/skel.c
-@@ -1142,7 +1142,7 @@
-   "/* This used to be an fputs(), but since the string might contain NUL's,",
-   " * we now use fwrite().",
-   " */",
--  "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
-+  "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
-   "%endif",
-   "%if-c++-only C++ definition",
-   "#define ECHO LexerOutput( yytext, yyleng )",
diff --git a/testing/flex/flex-2.5.35-missing-prototypes.patch b/testing/flex/flex-2.5.35-missing-prototypes.patch
deleted file mode 100644
index 5cde0660e..000000000
--- a/testing/flex/flex-2.5.35-missing-prototypes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl~	2010-07-13 17:18:43.000000000 +0200
-+++ flex-2.5.35/flex.skl	2010-07-13 17:23:49.000000000 +0200
-@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
- void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
- ]])
- 
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
-+[[
-+int yyget_column  M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
-+]])
-+]])
-+
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
-+[[
-+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
-+]])
-+]])
-+
- %if-bison-bridge
- m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
- [[
-
-Diff finished.  Tue Jul 13 17:27:50 2010
---- flex-2.5.35/skel.c~	2010-07-14 13:15:42.000000000 +0200
-+++ flex-2.5.35/skel.c	2010-07-14 13:16:05.000000000 +0200
-@@ -1027,6 +1027,22 @@
-   "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
-   "]])",
-   "",
-+  "m4_ifdef( [[M4_YY_REENTRANT]],",
-+  "[[",
-+  "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
-+  "[[",
-+  "int yyget_column  M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
-+  "]])",
-+  "]])",
-+  "",
-+  "m4_ifdef( [[M4_YY_REENTRANT]],",
-+  "[[",
-+  "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
-+  "[[",
-+  "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
-+  "]])",
-+  "]])",
-+  "",
-   "%if-bison-bridge",
-   "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
-   "[[",
diff --git a/testing/flex/flex-2.5.35-sign.patch b/testing/flex/flex-2.5.35-sign.patch
deleted file mode 100644
index fbee18bde..000000000
--- a/testing/flex/flex-2.5.35-sign.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flex-2.5.35/gen.c-orig	2008-04-30 22:51:08.000000000 +0200
-+++ flex-2.5.35/gen.c	2008-04-30 22:51:14.000000000 +0200
-@@ -1890,7 +1890,7 @@
- 			outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
- 			outn ("\t\t{ \\");
- 			outn ("\t\tint c = '*'; \\");
--			outn ("\t\tint n; \\");
-+			outn ("\t\tunsigned n; \\");
- 			outn ("\t\tfor ( n = 0; n < max_size && \\");
- 			outn ("\t\t\t     (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
- 			outn ("\t\t\tbuf[n] = (char) c; \\");
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/gawk/PKGBUILD b/testing/gawk/PKGBUILD
deleted file mode 100644
index eeb4803c0..000000000
--- a/testing/gawk/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 141716 2011-11-02 12:57:23Z tpowa $
-# Maintainer:
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=gawk
-pkgver=4.0.0
-pkgrel=2
-pkgdesc="GNU version of awk"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/directory/GNU/gawk.html"
-license=('GPL')
-groups=('base')
-depends=('sh' 'glibc')
-provides=('awk')
-install=gawk.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('51e417b71287629940051e6f652c6492')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib
-  make 
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make -j1 check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -dm755 ${pkgdir}/bin 
-  mv ${pkgdir}/usr/bin/gawk* ${pkgdir}/bin/
-  ln -sf gawk ${pkgdir}/bin/awk
-  ln -sf /bin/gawk ${pkgdir}/usr/bin/
-}
diff --git a/testing/gawk/gawk.install b/testing/gawk/gawk.install
deleted file mode 100644
index 3f7f24cfe..000000000
--- a/testing/gawk/gawk.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist=(gawk.info.gz gawkinet.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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gdbm/PKGBUILD b/testing/gdbm/PKGBUILD
deleted file mode 100644
index b56c4a3b0..000000000
--- a/testing/gdbm/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 142050 2011-11-04 22:53:48Z stephane $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=gdbm
-pkgver=1.8.3
-pkgrel=9
-pkgdesc="GNU database library"
-url="http://www.gnu.org/software/gdbm/gdbm.html"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('glibc' 'sh')
-source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz
-        gdbm-1.8.3-zeroheaders.patch
-        gdbm-1.8.3-fhs.patch)
-options=('!libtool' '!makeflags')
-install=gdbm.install
-md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1'
-         'a2ed344be9258775bd718074cf2e4ec6'
-         '66a7c235416c136dc89efc7d03352514')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Prevent gdbm from storing uninitialized memory content
-  # to database files. This patch improves security, as the
-  # uninitialized memory might contain sensitive informations
-  # from other applications.
-  # https://bugzilla.redhat.com/show_bug.cgi?id=4457
-  # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927
-  patch -Np1 -i ../gdbm-1.8.3-zeroheaders.patch
-
-  # Make gdbm buildable.
-  patch -Np1 -i ../gdbm-1.8.3-fhs.patch
-
-  libtoolize --force --copy
-  aclocal
-  autoconf
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
-
-  # flock does not work on nfs, we use fcntl instead
-  # https://bugzilla.redhat.com/show_bug.cgi?id=477300
-  echo "/* We use fcntl locking (POSIX) instead of flock (BSD) */" >> autoconf.h
-  echo "#undef HAVE_FLOCK" >> autoconf.h
-
-  make prefix=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix=$pkgdir/usr \
-       manprefix=$pkgdir/usr/share/man \
-       man3dir=$pkgdir/usr/share/man/man3 \
-       infodir=$pkgdir/usr/share/info \
-       install install-compat
-
-  ln -sf gdbm/gdbm.h $pkgdir/usr/include
-}
diff --git a/testing/gdbm/gdbm-1.8.3-fhs.patch b/testing/gdbm/gdbm-1.8.3-fhs.patch
deleted file mode 100644
index 58ce4de0b..000000000
--- a/testing/gdbm/gdbm-1.8.3-fhs.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -up gdbm-1.8.3/Makefile.in.fhs gdbm-1.8.3/Makefile.in
---- gdbm-1.8.3/Makefile.in.fhs	2002-10-08 18:09:12.000000000 +0200
-+++ gdbm-1.8.3/Makefile.in	2010-03-10 15:41:01.516025096 +0100
-@@ -1,7 +1,7 @@
- #### Start of system configuration section. ####
- 
- srcdir = @srcdir@
--top_builddir = .
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
- 
- CC = @CC@
-@@ -14,17 +14,13 @@ INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- 
--# File ownership and group
--BINOWN = bin
--BINGRP = bin
--
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- 
--DEFS =
-+DEFS = @DEFS@
- 
- # Where the system [n]dbm routines are...
--LIBS = @LIBS@ -lc
-+LIBS = @LIBS@
- 
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -32,16 +28,17 @@ LDFLAGS = @LDFLAGS@
- # Common prefix for installation directories
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--binprefix = $(exec_prefix)
--manprefix = $(prefix)
-+datarootdir = @datarootdir@
- 
- # Directory in which to put libgdbm.a.
- libdir = @libdir@
- # The include directory for gdbm.h and dbm.h.
- includedir = @includedir@
-+pkgincludedir = $(includedir)/gdbm
- # Info and man directories.
- infodir = @infodir@
--man3dir = @mandir@/man3
-+mandir = @mandir@
-+man3dir = $(mandir)/man3
- manext = 3
- 
- #### End of system configuration section. ####
-@@ -57,7 +54,7 @@ manext = 3
- 
- SHELL = /bin/sh
- 
--PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm
-+PROGS = libgdbm.la testgdbm testdbm testndbm conv2gdbm
- 
- DBM_CF = dbminit.c delete.c fetch.c store.c seq.c close.c
- 
-@@ -127,26 +124,17 @@ all: libgdbm.la libgdbm_compat.la
- progs: $(PROGS)
- 
- install: libgdbm.la gdbm.h gdbm.info
--	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
--		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
--		$(INSTALL_ROOT)$(infodir)
--	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
--		$(INSTALL_ROOT)$(includedir)/gdbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
--		$(INSTALL_ROOT)$(man3dir)/gdbm.3
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
--		$(INSTALL_ROOT)$(infodir)/gdbm.info
-+	$(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir)
-+	$(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la
-+	$(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h
-+	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
-+	$(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info
- 
- install-compat:
--	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
--		$(INSTALL_ROOT)$(includedir)
--	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
--		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
--		$(INSTALL_ROOT)$(includedir)/dbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
--		$(INSTALL_ROOT)$(includedir)/ndbm.h
-+	$(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir)
-+	$(LIBTOOL) install install libgdbm_compat.la $(libdir)/libgdbm_compat.la
-+	$(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h
-+	$(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h
- 
- #libgdbm.a: $(OBJS) gdbm.h
- #	rm -f libgdbm.a
-@@ -161,7 +149,7 @@ libgdbm.la: $(LOBJS) gdbm.h
- libgdbm_compat.la: $(C_LOBJS) gdbm.h
- 	rm -f libgdbm_compat.la
- 	$(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
--		-version-info $(SHLIB_VER) $(C_LOBJS)
-+		-version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm
- 
- gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
- 	rm -f gdbm.h
-@@ -172,10 +160,10 @@ gdbm.h:	gdbm.proto gdbmerrno.h gdbm.prot
- 	chmod -w gdbm.h
- 
- testgdbm: testgdbm.o libgdbm.la @LIBOBJS@
--	$(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
-+	$(LIBTOOL) link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
- 
- testdbm: testdbm.o libgdbm.la libgdbm_compat.la
--	$(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la
-+	$(LIBTOOL) link $(CC) $(LDFLAGS) -o testdbm testdbm.o $(LIBS) libgdbm_compat.la
- 
- tdbm: testdbm.o
- 	$(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS)
-@@ -184,7 +172,7 @@ testndbm.o: testndbm.c
- 	$(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c
- 
- testndbm: testndbm.o libgdbm.la libgdbm_compat.la
--	$(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la
-+	$(LIBTOOL) link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm_compat.la
- 
- tndbm.o: testndbm.c
- 	cp $(srcdir)/testndbm.c ./tndbm.c
-@@ -195,7 +183,7 @@ tndbm: tndbm.o
- 	$(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS)
- 
- conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@
--	$(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
-+	$(LIBTOOL) link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm_compat.la @LIBOBJS@
- 
- lintgdbm: 
- 	lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c
diff --git a/testing/gdbm/gdbm-1.8.3-zeroheaders.patch b/testing/gdbm/gdbm-1.8.3-zeroheaders.patch
deleted file mode 100644
index 088956aef..000000000
--- a/testing/gdbm/gdbm-1.8.3-zeroheaders.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-02_zero-headers.patch by Jeff Johnson <jbj@redhat.com> and Colin Watson <cjwatson@debian.org>
-
-diff -urNad a/falloc.c b/falloc.c
---- a/falloc.c	2001-02-28 06:52:33.000000000 +0000
-+++ b/falloc.c	2003-09-08 23:58:43.000000000 +0100
-@@ -272,7 +272,7 @@
- 
- 
-   /* Split the header block. */
--  temp = (avail_block *) malloc (av_size);
-+  temp = (avail_block *) calloc (1, av_size);
-   if (temp == NULL) _gdbm_fatal (dbf, "malloc error");
-   /* Set the size to be correct AFTER the pop_avail_block. */
-   temp->size = dbf->header->avail.size;
-diff -urNad a/gdbmopen.c b/gdbmopen.c
---- a/gdbmopen.c	2003-09-08 23:58:01.000000000 +0100
-+++ b/gdbmopen.c	2003-09-08 23:58:43.000000000 +0100
-@@ -212,7 +212,7 @@
- 	file_block_size = block_size;
- 
-       /* Get space for the file header. */
--      dbf->header = (gdbm_file_header *) malloc (file_block_size);
-+      dbf->header = (gdbm_file_header *) calloc (1, file_block_size);
-       if (dbf->header == NULL)
- 	{
- 	  gdbm_close (dbf);
-@@ -256,7 +256,7 @@
- 	(dbf->header->block_size - sizeof (hash_bucket))
- 	/ sizeof (bucket_element) + 1;
-       dbf->header->bucket_size  = dbf->header->block_size;
--      dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size);
-+      dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size);
-       if (dbf->bucket == NULL)
- 	{
- 	  gdbm_close (dbf);
-@@ -420,7 +420,7 @@
-       for(index = 0; index < size; index++)
-         {
-           (dbf->bucket_cache[index]).ca_bucket
--            = (hash_bucket *) malloc (dbf->header->bucket_size);
-+            = (hash_bucket *) calloc (1, dbf->header->bucket_size);
-           if ((dbf->bucket_cache[index]).ca_bucket == NULL)
- 	    {
-               gdbm_errno = GDBM_MALLOC_ERROR;
diff --git a/testing/gdbm/gdbm.install b/testing/gdbm/gdbm.install
deleted file mode 100644
index 2d1ce2c5a..000000000
--- a/testing/gdbm/gdbm.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=/usr/share/info
-filelist=(gdbm.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-    usr/bin/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
-    usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/testing/gegl/0.1.6-ffmpeg.patch b/testing/gegl/0.1.6-ffmpeg.patch
deleted file mode 100644
index 51fb95d28..000000000
--- a/testing/gegl/0.1.6-ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
---- gegl-0.1.6.old//operations/external/ff-load.c   2011-01-24 19:03:30.000000000 -0300
-+++ gegl-0.1.6/operations/external/ff-load.c    2011-05-04 09:59:48.910379742 -0300
-@@ -69,17 +69,17 @@
- {
-   switch (err)
-     {
--    case AVERROR_NUMEXPECTED:
-+    case AVERROR(EDOM):
-       g_warning ("%s: Incorrect image filename syntax.\n"
-                  "Use '%%d' to specify the image number:\n"
-                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
-                  "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
-                  filename);
-       break;
--    case AVERROR_INVALIDDATA:
-+    case AVERROR(EINVAL):
-       g_warning ("%s: Error while parsing header\n", filename);
-       break;
--    case AVERROR_NOFMT:
-+    case AVERROR(EILSEQ):
-       g_warning ("%s: Unknown format\n", filename);
-       break;
-     default:
-@@ -278,7 +278,7 @@
-       for (i = 0; i< p->ic->nb_streams; i++)
-         {
-           AVCodecContext *c = p->ic->streams[i]->codec;
--          if (c->codec_type == CODEC_TYPE_VIDEO)
-+          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
-             {
-               p->video_st = p->ic->streams[i];
-               p->video_stream = i;
diff --git a/testing/gegl/PKGBUILD b/testing/gegl/PKGBUILD
deleted file mode 100644
index cdae0afcc..000000000
--- a/testing/gegl/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 142143 2011-11-05 11:37:45Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gegl
-pkgver=0.1.6
-pkgrel=2
-pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
-url="http://www.gegl.org/"
-license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
-makedepends=('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 \
-        0.1.6-ffmpeg.patch)
-sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d'
-          'd62d4987f1c0fc256f5968271fc65cce0cc4c195')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch"
-  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
-    --with-libavformat --with-jasper --disable-docs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gettext/PKGBUILD b/testing/gettext/PKGBUILD
deleted file mode 100644
index 3bd769036..000000000
--- a/testing/gettext/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 142033 2011-11-04 11:47:22Z tpowa $
-# Maintainer:
-
-pkgname=gettext
-pkgver=0.18.1.1
-pkgrel=4
-pkgdesc="GNU internationalization library"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gettext/"
-license=('GPL')
-groups=('base')
-depends=('gcc-libs' 'acl' 'sh' 'glib2')
-optdepends=('cvs: for autopoint tool')
-options=(!libtool !docs)
-install=gettext.install
-source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3dd55b952826d2b32f51308f2f91aa89')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c
-  ./configure --prefix=/usr --enable-csharp
-  make
-}
-
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gettext/gettext.install b/testing/gettext/gettext.install
deleted file mode 100644
index 0ff52942f..000000000
--- a/testing/gettext/gettext.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(gettext.info.gz autosprintf.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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
deleted file mode 100644
index 4914b1953..000000000
--- a/testing/glib2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 142559 2011-11-12 07:37:46Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.30.2
-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=('pkgconfig' 'python2')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz
-        glib2.sh
-        glib2.csh)
-sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82'
-            '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
-            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
-
-build() {
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/etc/profile.d"
-  install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/"
-  install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/"
-
-  for _i in "${pkgdir}/etc/bash_completion.d/"*; do
-      chmod -x "${_i}"
-  done
-  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/gpm/PKGBUILD b/testing/gpm/PKGBUILD
deleted file mode 100644
index fe96eba1b..000000000
--- a/testing/gpm/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 141901 2011-11-03 00:10:37Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpm
-pkgver=1.20.6
-pkgrel=7
-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.bz2 \
-        gpm gpm.conf.d gpm.sh)
-sha1sums=('f3bb9272878b7934968381c8b25edab359114150'
-          '19e1feb1493373512a77801699df012d186336ea'
-          '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86'
-          '88fe5ff10916c68a87abc8418a56eb0073f69fa9')
-
-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"
-
-# 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.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/grep/PKGBUILD b/testing/grep/PKGBUILD
deleted file mode 100644
index 8366d083c..000000000
--- a/testing/grep/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141919 2011-11-03 06:55:30Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=grep
-pkgver=2.9
-pkgrel=2
-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=('25e41b2aa201104354740961ef36005a'
-         '78b903e88d23890d9e737e1415f4de21')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --bindir=/bin --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.install b/testing/grep/grep.install
deleted file mode 100644
index 7cd31301f..000000000
--- a/testing/grep/grep.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(grep.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/groff/PKGBUILD b/testing/groff/PKGBUILD
deleted file mode 100644
index 458b7be53..000000000
--- a/testing/groff/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 141718 2011-11-02 13:12:48Z tpowa $
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=groff
-pkgver=1.21
-pkgrel=2
-pkgdesc="GNU troff text-formatting system"
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/groff/groff.html"
-license=('GPL')
-depends=('perl' 'gcc-libs' 'texinfo')
-makedepends=('netpbm' 'psutils' 'ghostscript')
-optdepends=('netpbm: for use together with man -H command interaction in browsers'
-            'psutils: for use together with man -H command interaction in browsers')
-source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz
-        site.tmac)
-options=(!makeflags !docs)
-install=groff.install
-md5sums=('8b8cd29385b97616a0f0d96d0951c5bf'
-         'a1fedafd7863b37968d32ad9ae1d8c13')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --without-x
-  mkdir -p $pkgdir/usr
-  make
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-	cd $pkgdir/usr/bin
-	# needed for xman
-	ln -s eqn geqn
-	ln -s tbl gtbl
-	ln -s soelim zsoelim
-  rm -rf $pkgdir/usr/lib/groff/site-tmac
-  # Fix some issues when encoding to utf8 man pages
-  #  The output chars don't match keyboard chars...
-  cat $srcdir/site.tmac >> \
-    $pkgdir/usr/share/groff/site-tmac/man.local
-  cat $srcdir/site.tmac >> \
-    $pkgdir/usr/share/groff/site-tmac/mdoc.local
-}
diff --git a/testing/groff/groff.install b/testing/groff/groff.install
deleted file mode 100644
index 6807e4bef..000000000
--- a/testing/groff/groff.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(groff.info groff.info-1 groff.info-2 groff.info-3)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  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/groff/site.tmac b/testing/groff/site.tmac
deleted file mode 100644
index 8ef1040ca..000000000
--- a/testing/groff/site.tmac
+++ /dev/null
@@ -1,16 +0,0 @@
-.
-.if n \{\
-.  \" Character translations for non-keyboard
-.  \" characters - to make them searchable
-.  if '\*[.T]'utf8' \{\
-.    char \- \N'45'
-.    char - \N'45'
-.    char ' \N'39'
-.    char \' \N'39'
-.  \}
-.
-.  \" Shut off SGR by default (groff colors)
-.  \" Require GROFF_SGR envvar defined to turn it on
-.  if '\V[GROFF_SGR]'' \
-.    output x X tty: sgr 0
-.\}
diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index 6f355ef8a..000000000
--- a/testing/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 142123 2011-11-05 11:37:20Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-ugly
-pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.18
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
-md5sums=('04a7009a4efea2844075949c111f5e4d')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
-}
-
-package_gstreamer0.10-ugly() {
-  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.34')
-  
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-ugly-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make -C ext DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD
deleted file mode 100644
index 57aecb648..000000000
--- a/testing/gtk2/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 142501 2011-11-10 19:53:45Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.8
-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' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch)
-sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-            '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)
-
-    cd "${srcdir}/gtk+-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
-    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-    echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
-    #split this out to use with gtk3 too
-    rm ${pkgdir}/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
-    pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2')
-
-    cd "${srcdir}/gtk+-${pkgver}/gtk"
-
-    install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
-}
diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install
deleted file mode 100644
index 4e2b72f1b..000000000
--- a/testing/gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
-  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-}
diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/testing/gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/testing/gzip/PKGBUILD b/testing/gzip/PKGBUILD
deleted file mode 100644
index a71b9cf1c..000000000
--- a/testing/gzip/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 141921 2011-11-03 07:20:16Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=gzip
-pkgver=1.4
-pkgrel=4
-pkgdesc="GNU compression utility"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gzip/"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'bash')
-makedepends=('patch')
-install=gzip.install
-source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz{,.sig})
-md5sums=('e381b8506210c794278f5527cba0e765'
-         '3b11d485d1638f2d16f7494a0486a6e8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # By default Gzip uses assembly code. While this may preform better, 
-   # it is not position independent. The DEFS environment variable is 
-   # set to use only C code.
-   export DEFS="NO_ASM"
-  ./configure --prefix=/usr
-  make 
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix=${pkgdir}/usr install
-
-  install -dm755 ${pkgdir}/bin
-  mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/
-}
diff --git a/testing/gzip/gzip.install b/testing/gzip/gzip.install
deleted file mode 100644
index 24c8b8fb9..000000000
--- a/testing/gzip/gzip.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gzip.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/hdparm/PKGBUILD b/testing/hdparm/PKGBUILD
deleted file mode 100644
index fcb007d04..000000000
--- a/testing/hdparm/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 141929 2011-11-03 08:40:42Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=hdparm
-pkgver=9.37
-pkgrel=2
-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=('0bb94ddd1bedd5c02b1ca62f1caaf6de'
-         '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/idnkit/PKGBUILD b/testing/idnkit/PKGBUILD
deleted file mode 100644
index fddac5102..000000000
--- a/testing/idnkit/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 141693 2011-11-02 12:18:21Z bisson $
-# Contributor: Igor Nemilentsev <trezorg@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=idnkit
-pkgver=1.0
-pkgrel=2
-pkgdesc='Provides functionalities about Internationalized Domain Name processing'
-url='http://www.nic.ad.jp/ja/idn/idnkit/download/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-depends=('glibc')
-options=('!makeflags' '!libtool')
-source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz")
-sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048')
-
-backup=('etc/idnalias.conf' 'etc/idn.conf')
-
-build() {
-	cd "${srcdir}/idnkit-${pkgver}-src"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--enable-static=no
-	make
-}
-
-check() {
-	cd "${srcdir}/idnkit-${pkgver}-src"
-	make check
-}
-
-package() {
-	cd "${srcdir}/idnkit-${pkgver}-src"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	rm "${pkgdir}"/etc/*.sample
-}
diff --git a/testing/ifenslave/PKGBUILD b/testing/ifenslave/PKGBUILD
deleted file mode 100644
index 38ff0047f..000000000
--- a/testing/ifenslave/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 141697 2011-11-02 12:21:13Z bisson $
-# Maintainer: 
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=ifenslave
-pkgver=1.1.0
-pkgrel=7
-pkgdesc='Utility for bonding ethernet interfaces'
-arch=('i686' 'x86_64')
-url='http://www.linuxfoundation.org/en/Net:Bonding'
-license=('GPL2')
-depends=('glibc')
-makedepends=('linux-api-headers')
-backup=('etc/conf.d/bonding')
-source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf'
-        'bonding.conf.d')
-sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73'
-          '6843971c0254768868b556af33289d7d32d6208d')
-
-build() {
-	cd "${srcdir}"
-	gcc -Wall -Wstrict-prototypes ${CFLAGS} ${LDFLAGS} ifenslave.c -o ifenslave
-}
-
-package() {
-	cd "${srcdir}"
-	install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave
-	install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding
-}
diff --git a/testing/ifenslave/bonding.conf.d b/testing/ifenslave/bonding.conf.d
deleted file mode 100644
index 3092c5e95..000000000
--- a/testing/ifenslave/bonding.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Settings for ethernet bonding
-#
-# For each bond interface declared in INTERFACES (in rc.conf), declare
-# a bond_${IF} variable that contains the real ethernet interfaces that
-# should be bonded to the bond interface with the ifenslave utility.
-# Then list the bond interface name in the BOND_INTERFACES array.
-#
-
-#bond_bond0="eth0 eth1"
-#BOND_INTERFACES=(bond0)
-
diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD
deleted file mode 100644
index 9d84c9a7d..000000000
--- a/testing/iproute2/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 141994 2011-11-03 20:58:44Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=iproute2
-pkgver=2.6.39
-pkgrel=2
-pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('perl')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-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://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz
-	'iproute2-fhs.patch')
-sha1sums=('9044ad0b4a34a377a54197724373330294d743c7'
-          '2416b11252364d7a6c742eabb4a6924a75637a46')
-
-
-build() {
-  cd $srcdir/iproute2-${pkgver}
-  
-  # set correct fhs structure
-  patch -Np1 -i ${srcdir}/iproute2-fhs.patch
-
-  ./configure
-
-  make
-}
-
-package() {
-  cd $srcdir/iproute2-${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 2608414db..000000000
--- a/testing/iproute2/iproute2-fhs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
---- iproute2.old/Makefile	2009-11-11 22:05:21.251407668 +0100
-+++ iproute2-2.6.29/Makefile	2009-11-11 22:07:09.891833516 +0100
-@@ -1,11 +1,12 @@
- DESTDIR=/usr/
- ROOTDIR=$(DESTDIR)
- LIBDIR=/usr/lib/
--SBINDIR=/sbin
-+SBINDIR=/usr/sbin
- CONFDIR=/etc/iproute2
--DOCDIR=/share/doc/iproute2
--MANDIR=/share/man
-+DOCDIR=/usr/share/doc/iproute2
-+MANDIR=/usr/share/man
- ARPDDIR=/var/lib/arpd
-+SHAREDIR=/usr/share
-
- # Path to db_185.h include
- DBM_INCLUDE:=$(ROOTDIR)/usr/include
-diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
---- iproute2.old/tc/tc_util.c	2009-11-11 22:05:21.298076943 +0100
-+++ iproute2-2.6.29/tc/tc_util.c	2009-11-11 22:09:32.865152646 +0100
-@@ -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 -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
---- iproute2.old/netem/Makefile	2010-08-06 11:30:48.640940183 +0200
-+++ iproute2-2.6.35/netem/Makefile	2010-08-06 11:32:34.210908892 +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.old/tc/Makefile iproute2-2.6.35/tc/Makefile
---- iproute2.old/tc/Makefile	2010-08-06 11:48:35.607472252 +0200
-+++ iproute2-2.6.35/tc/Makefile	2010-08-06 11:49:36.977473380 +0200
-@@ -99,18 +99,11 @@
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	mkdir -p $(MODDESTDIR)
--	install -m 0755 tc $(DESTDIR)$(SBINDIR)
--	for i in $(TCSO); \
--	do install -m 755 $$i $(MODDESTDIR); \
--	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
-+	mkdir -p $(DESTDIR)$(LIBDIR)/tc
-+	install -m 0755 tc $(DESTDIR)$(SBINDIR)
-+	for i in $(TCSO); \
-+	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
-+	done
- 
- clean:
- 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD
deleted file mode 100644
index 8d762a504..000000000
--- a/testing/iptables/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 141703 2011-11-02 12:35:45Z bisson $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=iptables
-pkgver=1.4.12.1
-pkgrel=2
-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)
-backup=(etc/conf.d/iptables)
-sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728'
-          '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
-          '2db68906b603e5268736f48c8e251f3a49da1d75'
-          '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
-          '9907f9e815592837abc7fa3264a401567b7606ab'
-          'cdb830137192bbe002c6d01058656bd053ed0ddd'
-          'd9f9f06b46b4187648e860afa0552335aafe3ce4'
-          'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
-          '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
-          '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
-          'ebbd1424a1564fd45f455a81c61ce348f0a14c2e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://bugs.archlinux.org/task/17046
-  sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in
-  sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in
-
- # FS#25358: libxt_statistic.so undefined symbol: lround 
- export LDFLAGS='-lm'
-
- ./configure --prefix=/usr \
-     --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
-     --with-xtlibdir=/usr/lib/iptables \
-     --enable-devel --enable-libipq
-
-  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
-}
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/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.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/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 265d84d29..000000000
--- a/testing/iputils/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 141976 2011-11-03 20:08:42Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=iputils
-pkgver=20101006
-_traceroutever=1.4a12
-pkgrel=2
-pkgdesc="IP Configuration Utilities (and Ping)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.linuxfoundation.org/en/Net:Iputils"
-groups=('base')
-depends=('glibc' 'openssl' 'sysfsutils')
-conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute')
-replaces=('netkit-base' 'traceroute')
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
-        ftp://ftp.ee.lbl.gov/traceroute-${_traceroutever}.tar.gz
-        'permission-fix.patch'
-        'iputils-s20101006-manpages.patch')
-options=('!makeflags')
-md5sums=('a36c25e9ec17e48be514dc0485e7376c'
-         '964d599ef696efccdeebe7721cd4828d'
-         '66109966cad06e425bb12a78bab85b70'
-         'd02dffac6f16e841921a9fc73bd2d3bd')
-
-build() {
-  #build iptuils
-  cd "${srcdir}/${pkgname}-s${pkgver}"
-  
-  # Doc fails to build (see FS#20251)
-  # As a temporary workaround, we use these man pages from Fedora & LFS
-  patch -Np1 -i ../iputils-s20101006-manpages.patch
-  make
-
-  # build traceroute
-  # this is combined in this package because it's awkward as a separate package
-  cd "${srcdir}/traceroute-${_traceroutever}"
-  patch -Np1 -i ../permission-fix.patch
-  ./configure --prefix=/usr \
-              --sbindir=/bin \
-              --mandir=/usr/share/man
-  make CFLAGS="${CFLAGS} -Ilinux-include/"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-s${pkgver}"
-  for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do
-    install -D -m755 $i "${pkgdir}/usr/sbin/$i"
-  done
-  for i in ping ping6 traceroute6; do
-    install -D -m4755 $i "${pkgdir}/bin/$i"
-  done
- 
-  install -dm755 "${pkgdir}/usr/share/man/man8"
-  install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath,traceroute6}.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
-
-  cd "${srcdir}/traceroute-${_traceroutever}"
-  make DESTDIR="${pkgdir}" install install-man
-}
diff --git a/testing/iputils/iputils-s20101006-manpages.patch b/testing/iputils/iputils-s20101006-manpages.patch
deleted file mode 100644
index 764d0d36d..000000000
--- a/testing/iputils/iputils-s20101006-manpages.patch
+++ /dev/null
@@ -1,1044 +0,0 @@
---- /dev/null	2011-01-26 09:02:28.396666668 -0500
-+++ iputils-s20101006/doc/arping.8	2011-01-19 04:10:18.000000000 -0500
-@@ -0,0 +1,110 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "ARPING" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
-+.SH NAME
-+arping \- send ARP REQUEST to a neighbour host
-+.SH SYNOPSIS
-+
-+\fBarping\fR [ \fB-AbDfhqUV\fR]  [ \fB-c \fIcount\fB\fR]  [ \fB-w \fIdeadline\fB\fR]  [ \fB-s \fIsource\fB\fR]  \fB-I \fIinterface\fB\fR \fB\fIdestination\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+Ping \fIdestination\fR on device \fIinterface\fR by ARP packets,
-+using source address \fIsource\fR.
-+.SH "OPTIONS"
-+.TP
-+\fB-A\fR
-+The same as \fB-U\fR, but ARP REPLY packets used instead
-+of ARP REQUEST.
-+.TP
-+\fB-b\fR
-+Send only MAC level broadcasts. Normally \fBarping\fR starts
-+from sending broadcast, and switch to unicast after reply received.
-+.TP
-+\fB-c \fIcount\fB\fR
-+Stop after sending \fIcount\fR ARP REQUEST
-+packets. With 
-+\fIdeadline\fR
-+option, \fBarping\fR waits for
-+\fIcount\fR ARP REPLY packets, until the timeout expires.
-+.TP
-+\fB-D\fR
-+Duplicate address detection mode (DAD). See 
-+RFC2131, 4.4.1.
-+Returns 0, if DAD succeeded i.e. no replies are received
-+.TP
-+\fB-f\fR
-+Finish after the first reply confirming that target is alive.
-+.TP
-+\fB-I \fIinterface\fB\fR
-+Name of network device where to send ARP REQUEST packets. This option
-+is required.
-+.TP
-+\fB-h\fR
-+Print help page and exit.
-+.TP
-+\fB-q\fR
-+Quiet output. Nothing is displayed.
-+.TP
-+\fB-s \fIsource\fB\fR
-+IP source address to use in ARP packets.
-+If this option is absent, source address is:
-+.RS
-+.TP 0.2i
-+\(bu
-+In DAD mode (with option \fB-D\fR) set to 0.0.0.0.
-+.TP 0.2i
-+\(bu
-+In Unsolicited ARP mode (with options \fB-U\fR or \fB-A\fR)
-+set to \fIdestination\fR.
-+.TP 0.2i
-+\(bu
-+Otherwise, it is calculated from routing tables.
-+.RE
-+.TP
-+\fB-U\fR
-+Unsolicited ARP mode to update neighbours' ARP caches.
-+No replies are expected.
-+.TP
-+\fB-V\fR
-+Print version of the program and exit.
-+.TP
-+\fB-w \fIdeadline\fB\fR
-+Specify a timeout, in seconds, before
-+\fBarping\fR
-+exits regardless of how many
-+packets have been sent or received. In this case
-+\fBarping\fR
-+does not stop after
-+\fIcount\fR
-+packet are sent, it waits either for
-+\fIdeadline\fR
-+expire or until
-+\fIcount\fR
-+probes are answered.
-+.SH "SEE ALSO"
-+.PP
-+\fBping\fR(8),
-+\fBclockdiff\fR(8),
-+\fBtracepath\fR(8).
-+.SH "AUTHOR"
-+.PP
-+\fBarping\fR was written by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>.
-+It is now maintained by
-+YOSHIFUJI Hideaki
-+<yoshfuji@skbuff.net>.
-+.SH "SECURITY"
-+.PP
-+\fBarping\fR requires CAP_NET_RAWIO capability
-+to be executed. It is not recommended to be used as set-uid root,
-+because it allows user to modify ARP caches of neighbour hosts.
-+.SH "AVAILABILITY"
-+.PP
-+\fBarping\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
---- /dev/null	2011-01-26 09:02:28.396666668 -0500
-+++ iputils-s20101006/doc/clockdiff.8	2011-01-19 04:10:19.000000000 -0500
-@@ -0,0 +1,81 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "CLOCKDIFF" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
-+.SH NAME
-+clockdiff \- measure clock difference between hosts
-+.SH SYNOPSIS
-+
-+\fBclockdiff\fR [ \fB-o\fR]  [ \fB-o1\fR]  \fB\fIdestination\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBclockdiff\fR Measures clock difference between us and
-+\fIdestination\fR with 1 msec resolution using ICMP TIMESTAMP
-+[2]
-+packets or, optionally, IP TIMESTAMP option
-+[3]
-+option added to ICMP ECHO.
-+[1]
-+.SH "OPTIONS"
-+.TP
-+\fB-o\fR
-+Use IP TIMESTAMP with ICMP ECHO instead of ICMP TIMESTAMP
-+messages. It is useful with some destinations, which do not support
-+ICMP TIMESTAMP (f.e. Solaris <2.4).
-+.TP
-+\fB-o1\fR
-+Slightly different form of \fB-o\fR, namely it uses three-term
-+IP TIMESTAMP with prespecified hop addresses instead of four term one.
-+What flavor works better depends on target host. Particularly,
-+\fB-o\fR is better for Linux.
-+.SH "WARNINGS"
-+.TP 0.2i
-+\(bu
-+Some nodes (Cisco) use non-standard timestamps, which is allowed
-+by RFC, but makes timestamps mostly useless.
-+.TP 0.2i
-+\(bu
-+Some nodes generate messed timestamps (Solaris>2.4), when
-+run \fBxntpd\fR. Seems, its IP stack uses a corrupted clock source,
-+which is synchronized to time-of-day clock periodically and jumps
-+randomly making timestamps mostly useless. Good news is that you can
-+use NTP in this case, which is even better.
-+.TP 0.2i
-+\(bu
-+\fBclockdiff\fR shows difference in time modulo 24 days.
-+.SH "SEE ALSO"
-+.PP
-+\fBping\fR(8),
-+\fBarping\fR(8),
-+\fBtracepath\fR(8).
-+.SH "REFERENCES"
-+.PP
-+[1] ICMP ECHO,
-+RFC0792, page 14.
-+.PP
-+[2] ICMP TIMESTAMP,
-+RFC0792, page 16.
-+.PP
-+[3] IP TIMESTAMP option,
-+RFC0791, 3.1, page 16.
-+.SH "AUTHOR"
-+.PP
-+\fBclockdiff\fR was compiled by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>. It was based on code borrowed
-+from BSD \fBtimed\fR daemon.
-+It is now maintained by
-+YOSHIFUJI Hideaki
-+<yoshfuji@skbuff.net>.
-+.SH "SECURITY"
-+.PP
-+\fBclockdiff\fR requires CAP_NET_RAWIO capability
-+to be executed. It is safe to be used as set-uid root.
-+.SH "AVAILABILITY"
-+.PP
-+\fBclockdiff\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
---- /dev/null	2011-01-26 09:02:28.396666668 -0500
-+++ iputils-s20101006/doc/ping.8	2011-01-19 04:10:19.000000000 -0500
-@@ -0,0 +1,408 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "PING" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
-+.SH NAME
-+ping, ping6 \- send ICMP ECHO_REQUEST to network hosts
-+.SH SYNOPSIS
-+
-+\fBping\fR [ \fB-LRUbdfnqrvVaAB\fR]  [ \fB-c \fIcount\fB\fR]  [ \fB-m \fImark\fB\fR]  [ \fB-i \fIinterval\fB\fR]  [ \fB-l \fIpreload\fB\fR]  [ \fB-p \fIpattern\fB\fR]  [ \fB-s \fIpacketsize\fB\fR]  [ \fB-t \fIttl\fB\fR]  [ \fB-w \fIdeadline\fB\fR]  [ \fB-F \fIflowlabel\fB\fR]  [ \fB-I \fIinterface\fB\fR]  [ \fB-M \fIhint\fB\fR]  [ \fB-N \fInioption\fB\fR]  [ \fB-Q \fItos\fB\fR]  [ \fB-S \fIsndbuf\fB\fR]  [ \fB-T \fItimestamp option\fB\fR]  [ \fB-W \fItimeout\fB\fR]  [ \fB\fIhop\fB\fR\fI ...\fR]  \fB\fIdestination\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBping\fR uses the ICMP protocol's mandatory ECHO_REQUEST
-+datagram to elicit an ICMP ECHO_RESPONSE from a host or gateway.
-+ECHO_REQUEST datagrams (``pings'') have an IP and ICMP
-+header, followed by a struct timeval and then an arbitrary
-+number of ``pad'' bytes used to fill out the packet.
-+.PP
-+\fBping6\fR can also send Node Information Queries (RFC4620).
-+.SH "OPTIONS"
-+.TP
-+\fB-a\fR
-+Audible ping.
-+.TP
-+\fB-A\fR
-+Adaptive ping. Interpacket interval adapts to round-trip time, so that
-+effectively not more than one (or more, if preload is set) unanswered probes
-+present in the network. Minimal interval is 200msec for not super-user.
-+On networks with low rtt this mode is essentially equivalent to flood mode.  
-+.TP
-+\fB-b\fR
-+Allow pinging a broadcast address.
-+.TP
-+\fB-B\fR
-+Do not allow \fBping\fR to change source address of probes.
-+The address is bound to one selected when \fBping\fR starts.
-+.TP
-+\fB-m \fImark\fB\fR
-+use \fImark\fR to tag the packets going out. This is useful
-+for variety of reasons within the kernel such as using policy
-+routing to select specific outbound processing.
-+.TP
-+\fB-c \fIcount\fB\fR
-+Stop after sending \fIcount\fR ECHO_REQUEST
-+packets. With 
-+\fIdeadline\fR
-+option, \fBping\fR waits for
-+\fIcount\fR ECHO_REPLY packets, until the timeout expires.
-+.TP
-+\fB-d\fR
-+Set the SO_DEBUG option on the socket being used.
-+Essentially, this socket option is not used by Linux kernel. 
-+.TP
-+\fB-F \fIflow label\fB\fR
-+Allocate and set 20 bit flow label on echo request packets.
-+(Only \fBping6\fR). If value is zero, kernel allocates random flow label.
-+.TP
-+\fB-f\fR
-+Flood ping. For every ECHO_REQUEST sent a period ``.'' is printed,
-+while for ever ECHO_REPLY received a backspace is printed.
-+This provides a rapid display of how many packets are being dropped.
-+If interval is not given, it sets interval to zero and
-+outputs packets as fast as they come back or one hundred times per second,
-+whichever is more.
-+Only the super-user may use this option with zero interval.
-+.TP
-+\fB-i \fIinterval\fB\fR
-+Wait \fIinterval\fR seconds between sending each packet.
-+The default is to wait for one second between each packet normally,
-+or not to wait in flood mode. Only super-user may set interval
-+to values less 0.2 seconds.
-+.TP
-+\fB-I \fIinterface address\fB\fR
-+Set source address to specified interface address. Argument
-+may be numeric IP address or name of device. When pinging IPv6
-+link-local address this option is required.
-+.TP
-+\fB-l \fIpreload\fB\fR
-+If \fIpreload\fR is specified,
-+\fBping\fR sends that many packets not waiting for reply.
-+Only the super-user may select preload more than 3.
-+.TP
-+\fB-L\fR
-+Suppress loopback of multicast packets.  This flag only applies if the ping
-+destination is a multicast address.
-+.TP
-+\fB-N \fInioption\fB\fR
-+Send ICMPv6 Node Information Queries (RFC4620), instead of Echo Request.
-+.RS
-+.TP
-+\fBname\fR
-+Queries for Node Names.
-+.RE
-+.RS
-+.TP
-+\fBipv6\fR
-+Queries for IPv6 Addresses. There are several IPv6 specific flags.
-+.RS
-+.TP
-+\fBipv6-global\fR
-+Request IPv6 global-scope addresses.
-+.RE
-+.RS
-+.TP
-+\fBipv6-sitelocal\fR
-+Request IPv6 site-local addresses.
-+.RE
-+.RS
-+.TP
-+\fBipv6-linklocal\fR
-+Request IPv6 link-local addresses.
-+.RE
-+.RS
-+.TP
-+\fBipv6-all\fR
-+Request IPv6 addresses on other interfaces.
-+.RE
-+.RE
-+.RS
-+.TP
-+\fBipv4\fR
-+Queries for IPv4 Addresses.  There is one IPv4 specific flag.
-+.RS
-+.TP
-+\fBipv4-all\fR
-+Request IPv4 addresses on other interfaces.
-+.RE
-+.RE
-+.RS
-+.TP
-+\fBsubject-ipv6=\fIipv6addr\fB\fR
-+IPv6 subject address.
-+.RE
-+.RS
-+.TP
-+\fBsubject-ipv4=\fIipv4addr\fB\fR
-+IPv4 subject address.
-+.RE
-+.RS
-+.TP
-+\fBsubject-name=\fInodename\fB\fR
-+Subject name.  If it contains more than one dot,
-+fully-qualified domain name is assumed.
-+.RE
-+.RS
-+.TP
-+\fBsubject-fqdn=\fInodename\fB\fR
-+Subject name.  Fully-qualified domain name is
-+always assumed.
-+.RE
-+.TP
-+\fB-n\fR
-+Numeric output only.
-+No attempt will be made to lookup symbolic names for host addresses.
-+.TP
-+\fB-p \fIpattern\fB\fR
-+You may specify up to 16 ``pad'' bytes to fill out the packet you send.
-+This is useful for diagnosing data-dependent problems in a network.
-+For example, \fB-p ff\fR will cause the sent packet
-+to be filled with all ones.
-+.TP
-+\fB-D\fR
-+Print timestamp (unix time + microseconds as in gettimeofday) before
-+each line.
-+.TP
-+\fB-Q \fItos\fB\fR
-+Set Quality of Service -related bits in ICMP datagrams.  
-+\fItos\fR can be either decimal or hex number.
-+Traditionally (RFC1349), these have been interpreted as: 0 for reserved
-+(currently being redefined as congestion control), 1-4 for Type of Service
-+and 5-7 for Precedence.
-+Possible settings for Type of Service are: minimal cost: 0x02, 
-+reliability: 0x04, throughput: 0x08, low delay: 0x10.  Multiple TOS bits
-+should not be set simultaneously.  Possible settings for
-+special Precedence range from priority (0x20) to net control (0xe0).  You
-+must be root (CAP_NET_ADMIN capability) to use Critical or
-+higher precedence value.  You cannot set
-+bit 0x01 (reserved) unless ECN has been enabled in the kernel.
-+In RFC2474, these fields has been redefined as 8-bit Differentiated
-+Services (DS), consisting of: bits 0-1 of separate data (ECN will be used,
-+here), and bits 2-7 of Differentiated Services Codepoint (DSCP).
-+.TP
-+\fB-q\fR
-+Quiet output.
-+Nothing is displayed except the summary lines at startup time and
-+when finished.
-+.TP
-+\fB-R\fR
-+Record route.
-+Includes the RECORD_ROUTE option in the ECHO_REQUEST
-+packet and displays the route buffer on returned packets.
-+Note that the IP header is only large enough for nine such routes.
-+Many hosts ignore or discard this option.
-+.TP
-+\fB-r\fR
-+Bypass the normal routing tables and send directly to a host on an attached
-+interface.
-+If the host is not on a directly-attached network, an error is returned.
-+This option can be used to ping a local host through an interface
-+that has no route through it provided the option \fB-I\fR is also
-+used.
-+.TP
-+\fB-s \fIpacketsize\fB\fR
-+Specifies the number of data bytes to be sent.  
-+The default is 56, which translates into 64 ICMP
-+data bytes when combined with the 8 bytes of ICMP header data.
-+.TP
-+\fB-S \fIsndbuf\fB\fR
-+Set socket sndbuf. If not specified, it is selected to buffer
-+not more than one packet.
-+.TP
-+\fB-t \fIttl\fB\fR
-+Set the IP Time to Live.
-+.TP
-+\fB-T \fItimestamp option\fB\fR
-+Set special IP timestamp options.
-+\fItimestamp option\fR may be either 
-+\fItsonly\fR (only timestamps), 
-+\fItsandaddr\fR (timestamps and addresses) or 
-+\fItsprespec host1 [host2 [host3 [host4]]]\fR
-+(timestamp prespecified hops).
-+.TP
-+\fB-M \fIhint\fB\fR
-+Select Path MTU Discovery strategy.
-+\fIhint\fR may be either \fIdo\fR
-+(prohibit fragmentation, even local one), 
-+\fIwant\fR (do PMTU discovery, fragment locally when packet size
-+is large), or \fIdont\fR (do not set DF flag).
-+.TP
-+\fB-U\fR
-+Print full user-to-user latency (the old behaviour). Normally
-+\fBping\fR
-+prints network round trip time, which can be different
-+f.e. due to DNS failures. 
-+.TP
-+\fB-v\fR
-+Verbose output.
-+.TP
-+\fB-V\fR
-+Show version and exit.
-+.TP
-+\fB-w \fIdeadline\fB\fR
-+Specify a timeout, in seconds, before
-+\fBping\fR
-+exits regardless of how many
-+packets have been sent or received. In this case
-+\fBping\fR
-+does not stop after
-+\fIcount\fR
-+packet are sent, it waits either for
-+\fIdeadline\fR
-+expire or until
-+\fIcount\fR
-+probes are answered or for some error notification from network.   
-+.TP
-+\fB-W \fItimeout\fB\fR
-+Time to wait for a response, in seconds. The option affects only timeout
-+in absense of any responses, otherwise \fBping\fR waits for two RTTs.
-+.PP
-+When using \fBping\fR for fault isolation, it should first be run
-+on the local host, to verify that the local network interface is up
-+and running. Then, hosts and gateways further and further away should be
-+``pinged''. Round-trip times and packet loss statistics are computed.
-+If duplicate packets are received, they are not included in the packet
-+loss calculation, although the round trip time of these packets is used
-+in calculating the minimum/average/maximum round-trip time numbers.
-+When the specified number of packets have been sent (and received) or
-+if the program is terminated with a
-+SIGINT, a brief summary is displayed. Shorter current statistics
-+can be obtained without termination of process with signal
-+SIGQUIT.
-+.PP
-+If \fBping\fR does not receive any reply packets at all it will
-+exit with code 1. If a packet 
-+\fIcount\fR
-+and
-+\fIdeadline\fR
-+are both specified, and fewer than
-+\fIcount\fR
-+packets are received by the time the
-+\fIdeadline\fR
-+has arrived, it will also exit with code 1. 
-+On other error it exits with code 2. Otherwise it exits with code 0. This
-+makes it possible to use the exit code to see if a host is alive or
-+not.
-+.PP
-+This program is intended for use in network testing, measurement and
-+management.
-+Because of the load it can impose on the network, it is unwise to use
-+\fBping\fR during normal operations or from automated scripts.
-+.SH "ICMP PACKET DETAILS"
-+.PP
-+An IP header without options is 20 bytes.
-+An ICMP ECHO_REQUEST packet contains an additional 8 bytes worth
-+of ICMP header followed by an arbitrary amount of data.
-+When a \fIpacketsize\fR is given, this indicated the size of this
-+extra piece of data (the default is 56). Thus the amount of data received
-+inside of an IP packet of type ICMP ECHO_REPLY will always be 8 bytes
-+more than the requested data space (the ICMP header).
-+.PP
-+If the data space is at least of size of struct timeval
-+\fBping\fR uses the beginning bytes of this space to include
-+a timestamp which it uses in the computation of round trip times.
-+If the data space is shorter, no round trip times are given.
-+.SH "DUPLICATE AND DAMAGED PACKETS"
-+.PP
-+\fBping\fR will report duplicate and damaged packets.
-+Duplicate packets should never occur, and seem to be caused by
-+inappropriate link-level retransmissions.
-+Duplicates may occur in many situations and are rarely (if ever) a
-+good sign, although the presence of low levels of duplicates may not
-+always be cause for alarm.
-+.PP
-+Damaged packets are obviously serious cause for alarm and often
-+indicate broken hardware somewhere in the
-+\fBping\fR packet's path (in the network or in the hosts).
-+.SH "TRYING DIFFERENT DATA PATTERNS"
-+.PP
-+The (inter)network layer should never treat packets differently depending
-+on the data contained in the data portion.
-+Unfortunately, data-dependent problems have been known to sneak into
-+networks and remain undetected for long periods of time.
-+In many cases the particular pattern that will have problems is something
-+that doesn't have sufficient ``transitions'', such as all ones or all
-+zeros, or a pattern right at the edge, such as almost all zeros.
-+It isn't necessarily enough to specify a data pattern of all zeros (for
-+example) on the command line because the pattern that is of interest is
-+at the data link level, and the relationship between what you type and
-+what the controllers transmit can be complicated.
-+.PP
-+This means that if you have a data-dependent problem you will probably
-+have to do a lot of testing to find it.
-+If you are lucky, you may manage to find a file that either can't be sent
-+across your network or that takes much longer to transfer than other
-+similar length files.
-+You can then examine this file for repeated patterns that you can test
-+using the \fB-p\fR option of \fBping\fR.
-+.SH "TTL DETAILS"
-+.PP
-+The TTL value of an IP packet represents the maximum number of IP routers
-+that the packet can go through before being thrown away.
-+In current practice you can expect each router in the Internet to decrement
-+the TTL field by exactly one.
-+.PP
-+The TCP/IP specification states that the TTL field for TCP
-+packets should be set to 60, but many systems use smaller values
-+(4.3 BSD uses 30, 4.2 used 15).
-+.PP
-+The maximum possible value of this field is 255, and most Unix systems set
-+the TTL field of ICMP ECHO_REQUEST packets to 255.
-+This is why you will find you can ``ping'' some hosts, but not reach them
-+with
-+\fBtelnet\fR(1)
-+or
-+\fBftp\fR(1).
-+.PP
-+In normal operation ping prints the ttl value from the packet it receives.
-+When a remote system receives a ping packet, it can do one of three things
-+with the TTL field in its response:
-+.TP 0.2i
-+\(bu
-+Not change it; this is what Berkeley Unix systems did before the
-+4.3BSD Tahoe release. In this case the TTL value in the received packet
-+will be 255 minus the number of routers in the round-trip path.
-+.TP 0.2i
-+\(bu
-+Set it to 255; this is what current Berkeley Unix systems do.
-+In this case the TTL value in the received packet will be 255 minus the
-+number of routers in the path \fBfrom\fR
-+the remote system \fBto\fR the \fBping\fRing host.
-+.TP 0.2i
-+\(bu
-+Set it to some other value. Some machines use the same value for
-+ICMP packets that they use for TCP packets, for example either 30 or 60.
-+Others may use completely wild values.
-+.SH "BUGS"
-+.TP 0.2i
-+\(bu
-+Many Hosts and Gateways ignore the RECORD_ROUTE option.
-+.TP 0.2i
-+\(bu
-+The maximum IP header length is too small for options like
-+RECORD_ROUTE to be completely useful.
-+There's not much that that can be done about this, however.
-+.TP 0.2i
-+\(bu
-+Flood pinging is not recommended in general, and flood pinging the
-+broadcast address should only be done under very controlled conditions.
-+.SH "SEE ALSO"
-+.PP
-+\fBnetstat\fR(1),
-+\fBifconfig\fR(8).
-+.SH "HISTORY"
-+.PP
-+The \fBping\fR command appeared in 4.3BSD.
-+.PP
-+The version described here is its descendant specific to Linux.
-+.SH "SECURITY"
-+.PP
-+\fBping\fR requires CAP_NET_RAWIO capability
-+to be executed. It may be used as set-uid root.
-+.SH "AVAILABILITY"
-+.PP
-+\fBping\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
---- /dev/null	2011-01-26 09:02:28.396666668 -0500
-+++ iputils-s20101006/doc/rdisc.8	2011-01-19 04:10:20.000000000 -0500
-@@ -0,0 +1,110 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "RDISC" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
-+.SH NAME
-+rdisc \- network router discovery daemon
-+.SH SYNOPSIS
-+
-+\fBrdisc\fR [ \fB-abdfstvV\fR]  [ \fB\fIsend_address\fB\fR]  [ \fB\fIreceive_address\fB\fR] 
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBrdisc\fR implements client side of the ICMP router discover protocol.
-+\fBrdisc\fR is invoked at boot time to populate the network
-+routing tables with default routes. 
-+.PP
-+\fBrdisc\fR listens on the ALL_HOSTS (224.0.0.1) multicast address
-+(or \fIreceive_address\fR provided it is given) 
-+for ROUTER_ADVERTISE messages from routers. The received
-+messages are handled by first ignoring those listed router addresses
-+with which the host does not share a network. Among the remaining addresses
-+the ones with the highest preference are selected as default routers
-+and a default route is entered in the kernel routing table
-+for each one of them.
-+.PP
-+Optionally, \fBrdisc\fR can avoid waiting for routers to announce 
-+themselves by sending out a few ROUTER_SOLICITATION messages
-+to the ALL_ROUTERS (224.0.0.2) multicast address 
-+(or \fIsend_address\fR provided it is given) 
-+when it is started.
-+.PP
-+A timer is associated with each router address and the address will
-+no longer be considered for inclusion in the the routing tables if the 
-+timer expires before a new 
-+\fBadvertise\fR message is received from the router.
-+The address will also be excluded from consideration if the host receives an 
-+\fBadvertise\fR
-+message with the preference being maximally negative.
-+.PP
-+Server side of router discovery protocol is supported by Cisco IOS
-+and by any more or less complete UNIX routing daemon, f.e \fBgated\fR.
-+.SH "OPTIONS"
-+.TP
-+\fB-a\fR
-+Accept all routers independently of the preference they have in their 
-+\fBadvertise\fR messages.
-+Normally \fBrdisc\fR only accepts (and enters in the kernel routing
-+tables) the router or routers with the highest preference.
-+.TP
-+\fB-b\fR
-+Opposite to \fB-a\fR, i.e. install only router with the best
-+preference value. It is default behaviour.
-+.TP
-+\fB-d\fR
-+Send debugging messages to syslog.
-+.TP
-+\fB-f\fR
-+Run \fBrdisc\fR forever even if no routers are found.
-+Normally \fBrdisc\fR gives up if it has not received any 
-+\fBadvertise\fR message after after soliciting three times,
-+in which case it exits with a non-zero exit code.
-+If \fB-f\fR is not specified in the first form then 
-+\fB-s\fR must be specified.
-+.TP
-+\fB-s\fR
-+Send three \fBsolicitation\fR messages initially to quickly discover
-+the routers when the system is booted.
-+When \fB-s\fR is specified \fBrdisc\fR
-+exits with a non-zero exit code if it can not find any routers.
-+This can be overridden with the \fB-f\fR option.
-+.TP
-+\fB-t\fR
-+Test mode. Do not go to background.
-+.TP
-+\fB-v\fR
-+Be verbose i.e. send lots of debugging messages to syslog.
-+.TP
-+\fB-V\fR
-+Print version and exit.
-+.SH "HISTORY"
-+.PP
-+This program was developed by Sun Microsystems (see copyright
-+notice in source file). It was ported to Linux by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>.
-+It is now maintained by
-+YOSHIFUJI Hideaki
-+<yoshfuji@skbuff.net>.
-+.SH "SEE ALSO"
-+.PP
-+\fBicmp\fR(7),
-+\fBinet\fR(7),
-+\fBping\fR(8).
-+.SH "REFERENCES"
-+.PP
-+Deering, S.E.,ed "ICMP Router Discovery Messages",
-+RFC1256, Network Information Center, SRI International,
-+Menlo Park, Calif., September 1991.
-+.SH "SECURITY"
-+.PP
-+\fBrdisc\fR requires CAP_NET_RAWIO to listen
-+and send ICMP messages and capability CAP_NET_ADMIN
-+to update routing tables. 
-+.SH "AVAILABILITY"
-+.PP
-+\fBrdisc\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
---- /dev/null	2011-01-26 09:02:28.396666668 -0500
-+++ iputils-s20101006/doc/tracepath.8	2011-01-19 04:10:20.000000000 -0500
-@@ -0,0 +1,97 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "TRACEPATH" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
-+.SH NAME
-+tracepath, tracepath6 \- traces path to a network host discovering MTU along this path
-+.SH SYNOPSIS
-+
-+\fBtracepath\fR [ \fB-n\fR]  [ \fB-b\fR]  [ \fB-l \fIpktlen\fB\fR]  \fB\fIdestination\fB\fR [ \fB\fIport\fB\fR] 
-+
-+.SH "DESCRIPTION"
-+.PP
-+It traces path to \fIdestination\fR discovering MTU along this path.
-+It uses UDP port \fIport\fR or some random port.
-+It is similar to \fBtraceroute\fR, only does not require superuser
-+privileges and has no fancy options.
-+.PP
-+\fBtracepath6\fR is good replacement for \fBtraceroute6\fR
-+and classic example of application of Linux error queues.
-+The situation with IPv4 is worse, because commercial
-+IP routers do not return enough information in icmp error messages.
-+Probably, it will change, when they will be updated.
-+For now it uses Van Jacobson's trick, sweeping a range
-+of UDP ports to maintain trace history.
-+.SH "OPTIONS"
-+.TP
-+\fB-n\fR
-+Print primarily IP addresses numerically.
-+.TP
-+\fB-b\fR
-+Print both of host names and IP addresses.
-+.TP
-+\fB-l\fR
-+Sets the initial packet length to \fIpktlen\fR instead of
-+65536 for \fBtracepath\fR or 128000 for \fBtracepath6\fR.
-+.SH "OUTPUT"
-+.PP
-+
-+.nf
-+root@mops:~ # tracepath6 3ffe:2400:0:109::2
-+ 1?: [LOCALHOST]                              pmtu 1500
-+ 1:  dust.inr.ac.ru                   0.411ms
-+ 2:  dust.inr.ac.ru        asymm  1   0.390ms pmtu 1480
-+ 2:  3ffe:2400:0:109::2               463.514ms reached
-+     Resume: pmtu 1480 hops 2 back 2
-+.fi
-+.PP
-+The first column shows TTL of the probe, followed by colon.
-+Usually value of TTL is obtained from reply from network,
-+but sometimes reply does not contain necessary information and
-+we have to guess it. In this case the number is followed by ?.
-+.PP
-+The second column shows the network hop, which replied to the probe.
-+It is either address of router or word [LOCALHOST], if
-+the probe was not sent to the network.
-+.PP
-+The rest of line shows miscellaneous information about path to
-+the correspinding hetwork hop. As rule it contains value of RTT.
-+Additionally, it can show Path MTU, when it changes.
-+If the path is asymmetric
-+or the probe finishes before it reach prescribed hop, difference
-+between number of hops in forward and backward direction is shown
-+following keyword async. This information is not reliable.
-+F.e. the third line shows asymmetry of 1, it is because the first probe
-+with TTL of 2 was rejected at the first hop due to Path MTU Discovery.
-+.PP
-+The last line summarizes information about all the path to the destination,
-+it shows detected Path MTU, amount of hops to the destination and our
-+guess about amount of hops from the destination to us, which can be
-+different when the path is asymmetric.
-+.SH "SEE ALSO"
-+.PP
-+\fBtraceroute\fR(8),
-+\fBtraceroute6\fR(8),
-+\fBping\fR(8).
-+.SH "AUTHOR"
-+.PP
-+\fBtracepath\fR was written by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>.
-+.SH "SECURITY"
-+.PP
-+No security issues.
-+.PP
-+This lapidary deserves to be elaborated.
-+\fBtracepath\fR is not a privileged program, unlike
-+\fBtraceroute\fR, \fBping\fR and other beasts of this kind.
-+\fBtracepath\fR may be executed by everyone who has some access
-+to network, enough to send UDP datagrams to investigated destination
-+using given port.
-+.SH "AVAILABILITY"
-+.PP
-+\fBtracepath\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur /dev/null iputils-s20101006/doc/rarpd.8
----  /dev/null	2011-01-26 09:02:28.396666668 -0500
-+++ iputils-s20101006/doc/rarpd.8	2011-01-08 20:09:51.270811811 -0500
-@@ -0,0 +1,84 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "RARPD" "8" "08 January 2011" "iputils-101006" "System Manager's Manual: iputils"
-+.SH NAME
-+rarpd \- answer RARP REQUESTs
-+.SH SYNOPSIS
-+
-+\fBarping\fR [\fB-aAvde\fR] [\fB-b \fIbootdir\fB\fR] [\fB\fIinterface\fB\fR]
-+
-+.SH "DESCRIPTION"
-+.PP
-+Listens
-+RARP
-+requests from clients. Provided MAC address of client
-+is found in \fI/etc/ethers\fR database and
-+obtained host name is resolvable to an IP address appropriate
-+for attached network, \fBrarpd\fR answers to client with RARPD
-+reply carrying an IP address.
-+.PP
-+To allow multiple boot servers on the network \fBrarpd\fR
-+optionally checks for presence Sun-like bootable image in TFTP directory.
-+It should have form \fBHexadecimal_IP.ARCH\fR, f.e. to load
-+sparc 193.233.7.98 \fIC1E90762.SUN4M\fR is linked to
-+an image appropriate for SUM4M in directory \fI/etc/tftpboot\fR.
-+.SH "WARNING"
-+.PP
-+This facility is deeply obsoleted by
-+BOOTP
-+and later
-+DHCP protocols.
-+However, some clients really still need this to boot.
-+.SH "OPTIONS"
-+.TP
-+\fB-a\fR
-+Listen on all the interfaces. Currently it is an internal
-+option, its function is overridden with \fIinterface\fR
-+argument. It should not be used.
-+.TP
-+\fB-A\fR
-+Listen not only RARP but also ARP messages, some rare clients
-+use ARP by some unknown reason.
-+.TP
-+\fB-v\fR
-+Be verbose.
-+.TP
-+\fB-d\fR
-+Debug mode. Do not go to background.
-+.TP
-+\fB-e\fR
-+Do not check for presence of a boot image, reply if MAC address
-+resolves to a valid IP address using \fI/etc/ethers\fR
-+database and DNS. 
-+.TP
-+\fB-b \fIbootdir\fB\fR
-+TFTP boot directory. Default is \fI/etc/tftpboot\fR
-+.SH "SEE ALSO"
-+.PP
-+\fBarping\fR(8),
-+\fBtftpd\fR(8).
-+.SH "AUTHOR"
-+.PP
-+\fBrarpd\fR was written by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>.
-+It is now maintained by
-+YOSHIFUJI Hideaki
-+<yoshfuji@skbuff.net>.
-+.SH "SECURITY"
-+.PP
-+\fBrarpd\fR requires CAP_NET_RAWIO capability
-+to listen and send RARP and ARP packets. It also needs CAP_NET_ADMIN
-+to give to kernel hint for ARP resolution; this is not strictly required,
-+but some (most of, to be more exact) clients are so badly broken that
-+are not able to answer ARP before they are finally booted. This is
-+not wonderful taking into account that clients using RARPD in 2002
-+are all unsupported relic creatures of 90's and even earlier.
-+.SH "AVAILABILITY"
-+.PP
-+\fBrarpd\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur /dev/null iputils-s20101006/doc/tftpd.8
---- /dev/null	2011-01-26 09:02:28.396666668 -0500
-+++ iputils-s20101006/doc/tftpd.8	2011-01-08 20:09:51.723407498 -0500
-@@ -0,0 +1,85 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "TFTPD" "8" "08 January 2011" "iputils-101006" "System Manager's Manual: iputils"
-+.SH NAME
-+tftpd \- Trivial File Transfer Protocol server
-+.SH SYNOPSIS
-+
-+\fBtftpd\fR \fB\fIdirectory\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBtftpd\fR is a server which supports the DARPA
-+Trivial File Transfer Protocol
-+(RFC1350).
-+The TFTP server is started
-+by \fBinetd\fR(8).
-+.PP
-+\fIdirectory\fR is required argument; if it is not given
-+\fBtftpd\fR aborts. This path is prepended to any file name requested
-+via TFTP protocol, effectively chrooting \fBtftpd\fR to this directory.
-+File names are validated not to escape out of this directory, however
-+administrator may configure such escape using symbolic links.
-+.PP
-+It is in difference of variants of \fBtftpd\fR usually distributed
-+with unix-like systems, which take a list of directories and match
-+file names to start from one of given prefixes or to some random
-+default, when no arguments were given. There are two reasons not to
-+behave in this way: first, it is inconvenient, clients are not expected
-+to know something about layout of filesystem on server host.
-+And second, TFTP protocol is not a tool for browsing of server's filesystem,
-+it is just an agent allowing to boot dumb clients. 
-+.PP
-+In the case when \fBtftpd\fR is used together with
-+\fBrarpd\fR(8),
-+tftp directories in these services should coincide and it is expected
-+that each client booted via TFTP has boot image corresponding
-+its IP address with an architecture suffix following Sun Microsystems
-+conventions. See 
-+\fBrarpd\fR(8)
-+for more details.
-+.SH "SECURITY"
-+.PP
-+TFTP protocol does not provide any authentication.
-+Due to this capital flaw \fBtftpd\fR is not able to restrict
-+access to files and will allow only publically readable
-+files to be accessed. Files may be written only if they already
-+exist and are publically writable.
-+.PP
-+Impact is evident, directory exported via TFTP \fBmust not\fR
-+contain sensitive information of any kind, everyone is allowed
-+to read it as soon as a client is allowed. Boot images do not contain
-+such information as rule, however you should think twice before
-+publishing f.e. Cisco IOS config files via TFTP, they contain
-+\fBunencrypted\fR passwords and may contain some information
-+about the network, which you were not going to make public.
-+.PP
-+The \fBtftpd\fR server should be executed by \fBinetd\fR
-+with dropped root privileges, namely with a user ID giving minimal
-+access to files published in tftp directory. If it is executed
-+as superuser occasionally, \fBtftpd\fR drops its UID and GID
-+to 65534, which is most likely not the thing which you expect.
-+However, this is not very essential; remember, only files accessible
-+for everyone can be read or written via TFTP.
-+.SH "SEE ALSO"
-+.PP
-+\fBrarpd\fR(8),
-+\fBtftp\fR(1),
-+\fBinetd\fR(8).
-+.SH "HISTORY"
-+.PP
-+The \fBtftpd\fR command appeared in 4.2BSD. The source in iputils
-+is cleaned up both syntactically (ANSIized) and semantically (UDP socket IO).
-+.PP
-+It is distributed with iputils mostly as good demo of an interesting feature
-+(MSG_CONFIRM) allowing to boot long images by dumb clients
-+not answering ARP requests until they are finally booted.
-+However, this is full functional and can be used in production.
-+.SH "AVAILABILITY"
-+.PP
-+\fBtftpd\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur /dev/null iputils-s20101006/doc/traceroute6.8
---- /dev/null	1969-12-31 19:00:00.000000000 -0500
-+++ iputils-s20101006/doc/traceroute6.8	2011-01-08 20:09:52.114781859 -0500
-@@ -0,0 +1,42 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "TRACEROUTE6" "8" "08 January 2011" "iputils-101006" "System Manager's Manual: iputils"
-+.SH NAME
-+traceroute6 \- traces path to a network host
-+.SH SYNOPSIS
-+
-+\fBtraceroute6\fR [\fB-dnrvV\fR] [\fB-i \fIinterface\fB\fR] [\fB-m \fImax_ttl\fB\fR] [\fB-p \fIport\fB\fR] [\fB-q \fImax_probes\fB\fR] [\fB-s \fIsource\fB\fR] [\fB-w \fIwait time\fB\fR] \fB\fIdestination\fB\fR [\fB\fIsize\fB\fR]
-+
-+.SH "DESCRIPTION"
-+.PP
-+Description can be found in 
-+\fBtraceroute\fR(8),
-+all the references to IP replaced to IPv6. It is needless to copy
-+the description from there.
-+.SH "SEE ALSO"
-+.PP
-+\fBtraceroute\fR(8),
-+\fBtracepath\fR(8),
-+\fBping\fR(8).
-+.SH "HISTORY"
-+.PP
-+This program has long history. Author of \fBtraceroute\fR
-+is Van Jacobson and it first appeared in 1988. This clone is
-+based on a port of \fBtraceroute\fR to IPv6 published
-+in NRL IPv6 distribution in 1996. In turn, it was ported
-+to Linux by Pedro Roque. After this it was kept in sync by    
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>. And eventually entered
-+\fBiputils\fR package.
-+.SH "SECURITY"
-+.PP
-+\fBtracepath6\fR requires CAP_NET_RAWIO capability
-+to be executed. It is safe to be used as set-uid root.
-+.SH "AVAILABILITY"
-+.PP
-+\fBtraceroute6\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
diff --git a/testing/iputils/permission-fix.patch b/testing/iputils/permission-fix.patch
deleted file mode 100644
index c47636f84..000000000
--- a/testing/iputils/permission-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- traceroute-1.4a12/Makefile.in.old	2000-11-23 21:05:29.000000000 +0100
-+++ traceroute-1.4a12/Makefile.in	2008-09-27 20:04:30.000000000 +0200
-@@ -90,10 +90,10 @@
- 	sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@
- 
- install: force
--	$(INSTALL) -m 4555 -o root -g bin traceroute $(DESTDIR)$(BINDEST)
-+	$(INSTALL) -m 4555 -o root -g root traceroute $(DESTDIR)$(BINDEST)
- 
- install-man: force
--	$(INSTALL) -m 444 -o bin -g bin traceroute.8 $(DESTDIR)$(MANDEST)/man8
-+	$(INSTALL) -m 644 -o root -g root traceroute.8 $(DESTDIR)$(MANDEST)/man8
- 
- lint: $(GENSRC) force
- 	lint -hbxn $(SRC) | \
diff --git a/testing/k3b/PKGBUILD b/testing/k3b/PKGBUILD
deleted file mode 100644
index 9bdef9769..000000000
--- a/testing/k3b/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 142145 2011-11-05 11:37:47Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=k3b
-pkgver=2.0.2
-pkgrel=3
-pkgdesc="Feature-rich and easy to handle CD burning application"
-arch=('i686' 'x86_64')
-url="http://k3b.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 
-         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' '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')
-options=('!libtool')
-install=k3b.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        k3b-2.0.2-ffmpeg.patch)
-sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
-          '8120c0e22e6c41ea285ca6060be13723ed91c52b')
-
-build() {
-  cd "${srcdir}"
-  (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch")
-  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.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/kdelibs/PKGBUILD b/testing/kdelibs/PKGBUILD
deleted file mode 100644
index 63cb0be7f..000000000
--- a/testing/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 141885 2011-11-02 18:32:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.3
-pkgrel=2
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
-        'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
-        'docbook-xsl' 'qtwebkit')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
-        'hspell')
-replaces=('kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('4f1bbd1b4d558f3541057747db9bf7e9dcececb3'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
-       cd "${srcdir}"
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/testing/kdelibs/archlinux-menu.patch b/testing/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/testing/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>
diff --git a/testing/kdelibs/kde-applications-menu.patch b/testing/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/testing/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/testing/kdelibs/kdelibs-nepomuk-unicode.diff b/testing/kdelibs/kdelibs-nepomuk-unicode.diff
deleted file mode 100644
index 1c85d6fc9..000000000
--- a/testing/kdelibs/kdelibs-nepomuk-unicode.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
-index 055482e..3880e13 100644
---- a/nepomuk/query/querybuilderdata_p.h
-+++ b/nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
- 
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+    QStringList newTerms;
-+    foreach(const QString& term, terms) {
-+        int i = 0;
-+        while(i < term.length()) {
-+            if(term[i].unicode() > 0x7f) {
-+                break;
-+            }
-+            ++i;
-+        }
-+        if(i > 0) {
-+            newTerms.append(term.left(i));
-+        }
-+    }
-+    return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
-     namespace Query {
-         class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
-                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
-                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
-                         const QString& varName = it.key();
--                        const QStringList& terms = it.value();
--                        // bif:search_excerpt wants a vector of all search terms
--                        excerptParts
--                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
--                            .arg( terms.join(QLatin1String("','")),
--                                  varName );
-+                        const QStringList terms = stripExtendedCharsHack(it.value());
-+                        if(terms.count()) {
-+                            // bif:search_excerpt wants a vector of all search terms
-+                            excerptParts
-+                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+                                       .arg( terms.join(QLatin1String("','")),
-+                                             varName );
-+                        }
-                     }
- 
--                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
--                        .arg(excerptParts.join(QLatin1String(",")));
-+                    if(excerptParts.count()) {
-+                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+                                .arg(excerptParts.join(QLatin1String(",")));
-+                    }
-+                    else {
-+                        return QString();
-+                    }
-                 }
-                 else {
-                     return QString();
-\ No newline at end of file
diff --git a/testing/kdelibs/kdelibs.install b/testing/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/testing/kdelibs/kdelibs.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/kdemultimedia/PKGBUILD b/testing/kdemultimedia/PKGBUILD
deleted file mode 100644
index f9d57749e..000000000
--- a/testing/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 142147 2011-11-05 11:37:50Z 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.7.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
-            'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config')
-sha1sums=('4db44494e6a2ef886e3513b6a2eb4e526741a6ff'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
-
-build() {
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xine=OFF
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dragonplayer
-	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' 'tunepimp')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/juk
-	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 doc/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/doc/kmix
-	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
-	cd $srcdir/build/doc/kcontrol/cddbretrieval
-	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/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/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD
deleted file mode 100644
index 97486239a..000000000
--- a/testing/keyutils/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 142044 2011-11-04 20:54:48Z stephane $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=keyutils
-pkgver=1.5.2
-pkgrel=2
-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=('19811ee31f683058a9aae3e6a3a23a7f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i "s|/lib64|/lib|g" Makefile
-  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kradio/PKGBUILD b/testing/kradio/PKGBUILD
deleted file mode 100644
index b73b80c90..000000000
--- a/testing/kradio/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 142149 2011-11-05 11:37:56Z ibiru $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.2
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL2')
-pkgdesc="A comfortable KDE radio application"
-url="http://kradio.sourceforge.net/"
-depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
-makedepends=('pkg-config' 'automoc4' 'cmake')
-install=kradio.install
-source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
-options=(!libtool)
-
-build() {
-  cd "$srcdir"
-  (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff")
-  mkdir build
-  cd build
-  cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('18fea3e2bc7100882075187c6a89f7bd'
-         '5f407eb75536f39e79c77a70613e8704'
-         '7d31a4f54602bc109f39cc0a7a1dc50c')
diff --git a/testing/kradio/kradio-ffmpeg.diff b/testing/kradio/kradio-ffmpeg.diff
deleted file mode 100644
index 27d224fec..000000000
--- a/testing/kradio/kradio-ffmpeg.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988
-
-diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp
-index 4cd6cc0..c74d6e2 100644
---- a/plugins/internetradio/decoder_thread.cpp
-+++ b/plugins/internetradio/decoder_thread.cpp
-@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
- 
-     //av_log_set_level(255);
-     m_av_pFormatCtx = avformat_alloc_context();
--    memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx));
-     m_av_pFormatCtx->probesize = m_maxProbeSize;
-     m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE;
- 
-@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-         m_av_pFormatCtx_opened = true;
-     }
-     else {
--
- //         IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start");
-         if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) {
-             if (warningsNotErrors) {
-@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-     m_av_audioStream = -1;
-     for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
- //         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
-+#else
-+        if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
-+#endif
-             m_av_audioStream = i;
-             break;
-         }
diff --git a/testing/kradio/kradio.install b/testing/kradio/kradio.install
deleted file mode 100644
index af52669f5..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() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD
deleted file mode 100644
index 0ba2538c2..000000000
--- a/testing/krb5/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 142052 2011-11-04 23:20:14Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=krb5
-pkgver=1.9.2
-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')
-provides=('heimdal')
-replaces=('heimdal')
-conflicts=('heimdal')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
-        krb5-kadmind
-        krb5-kdc
-        krb5-kpropd
-        krb5-1.9.1-config-script.patch)
-sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92'
-          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
-          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          '7f402078fa65bb9ff1beb6cbbbb017450df78560'
-          '7342410760cf44bfa01bb99bb4c49e12496cb46f')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${pkgname}-${pkgver}.tar.gz
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-
-   # - Make krb5-config suppress CFLAGS output when called with --libs
-   #   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
-   #
-   # - Omit extra libraries because their interfaces are not exposed to applications
-   #   by libkrb5, unless do_deps is set to 1, which indicates that the caller
-   #   wants the whole list.
-   #
-   #   Patch from upstream : 
-   #   http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
-   patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
-
-   # FS#25384
-   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-
-   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
-   export CPPFLAGS+=" -I/usr/include/et"
-   ./configure --prefix=/usr \
-               --mandir=/usr/share/man \
-               --localstatedir=/var/lib \
-               --enable-shared \
-               --with-system-et \
-               --with-system-ss \
-               --disable-rpath \
-               --without-tcl \
-               --enable-dns-for-realm \
-               --with-ldap
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
-
-   # Sample KDC config file
-   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
-   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
-
-   # Default configuration file
-   install -dm 755 "${pkgdir}"/etc
-   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
-
-   install -dm 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kdc      "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-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
-}
diff --git a/testing/krb5/krb5-1.9.1-2011-006.patch b/testing/krb5/krb5-1.9.1-2011-006.patch
deleted file mode 100644
index 05a22caf5..000000000
--- a/testing/krb5/krb5-1.9.1-2011-006.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c
-index b473611..50c60b7 100644
---- a/src/plugins/kdb/db2/lockout.c
-+++ b/src/plugins/kdb/db2/lockout.c
-@@ -169,6 +169,9 @@ krb5_db2_lockout_audit(krb5_context context,
-         return 0;
-     }
- 
-+    if (entry == NULL)
-+        return 0;
-+
-     if (!db_ctx->disable_lockout) {
-         code = lookup_lockout_policy(context, entry, &max_fail,
-                                      &failcnt_interval, &lockout_duration);
-@@ -176,6 +179,15 @@ krb5_db2_lockout_audit(krb5_context context,
-             return code;
-     }
- 
-+    /*
-+     * Don't continue to modify the DB for an already locked account.
-+     * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+     * this check is unneeded, but in rare cases, we can fail with an
-+     * integrity error or preauth failure before a policy check.)
-+     */
-+    if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+        return 0;
-+
-     /* Only mark the authentication as successful if the entry
-      * required preauthentication, otherwise we have no idea. */
-     if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 552e39a..c2f44ab 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -105,6 +105,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
-     CHECK_LDAP_HANDLE(ldap_context);
- 
-     if (is_principal_in_realm(ldap_context, searchfor) != 0) {
-+        st = KRB5_KDB_NOENTRY;
-         krb5_set_error_message (context, st, "Principal does not belong to realm");
-         goto cleanup;
-     }
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-index a218dc7..fd164dd 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-@@ -165,6 +165,9 @@ krb5_ldap_lockout_audit(krb5_context context,
-         return 0;
-     }
- 
-+    if (entry == NULL)
-+        return 0;
-+
-     if (!ldap_context->disable_lockout) {
-         code = lookup_lockout_policy(context, entry, &max_fail,
-                                      &failcnt_interval,
-@@ -173,9 +176,16 @@ krb5_ldap_lockout_audit(krb5_context context,
-             return code;
-     }
- 
--    entry->mask = 0;
-+    /*
-+     * Don't continue to modify the DB for an already locked account.
-+     * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+     * this check is unneeded, but in rare cases, we can fail with an
-+     * integrity error or preauth failure before a policy check.)
-+     */
-+    if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+        return 0;
- 
--    assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
-+    entry->mask = 0;
- 
-     /* Only mark the authentication as successful if the entry
-      * required preauthentication, otherwise we have no idea. */
diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
deleted file mode 100644
index e5a38498f..000000000
--- a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c
---- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c	2011-02-09 16:55:36.000000000 -0500
-+++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c	2011-09-26 18:42:01.465190278 -0400
-@@ -470,13 +470,10 @@
- 
- /***** STATE_REFERRALS *****/
- 
--/*
-- * Possibly retry a request in the fallback realm after a referral request
-- * failure in the local realm.  Expects ctx->reply_code to be set to the error
-- * from a referral request.
-- */
-+/* Possibly try a non-referral request after a referral request failure.
-+ * Expects ctx->reply_code to be set to the error from a referral request. */
- static krb5_error_code
--try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
-+try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
- {
-     krb5_error_code code;
-     char **hrealms;
-@@ -485,9 +482,10 @@
-     if (ctx->referral_count > 1)
-         return ctx->reply_code;
- 
--    /* Only fall back if the original request used the referral realm. */
-+    /* If the request used a specified realm, make a non-referral request to
-+     * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
-     if (!krb5_is_referral_realm(&ctx->req_server->realm))
--        return ctx->reply_code;
-+        return begin_non_referral(context, ctx);
- 
-     if (ctx->server->length < 2) {
-         /* We need a type/host format principal to find a fallback realm. */
-@@ -500,10 +498,10 @@
-     if (code != 0)
-         return code;
- 
--    /* Give up if the fallback realm isn't any different. */
-+    /* If the fallback realm isn't any different, use the existing TGT. */
-     if (data_eq_string(ctx->server->realm, hrealms[0])) {
-         krb5_free_host_realm(context, hrealms);
--        return ctx->reply_code;
-+        return begin_non_referral(context, ctx);
-     }
- 
-     /* Rewrite server->realm to be the fallback realm. */
-@@ -540,9 +538,9 @@
-     krb5_error_code code;
-     const krb5_data *referral_realm;
- 
--    /* Possibly retry with the fallback realm on error. */
-+    /* Possibly try a non-referral fallback request on error. */
-     if (ctx->reply_code != 0)
--        return try_fallback_realm(context, ctx);
-+        return try_fallback(context, ctx);
- 
-     if (krb5_principal_compare(context, ctx->reply_creds->server,
-                                ctx->server)) {
diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch
deleted file mode 100644
index a72a75edf..000000000
--- a/testing/krb5/krb5-1.9.1-config-script.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
---- krb5-1.9.1.ori/src/krb5-config.in	2010-01-19 13:44:57.000000000 -0500
-+++ krb5-1.9.1/src/krb5-config.in	2011-09-26 18:27:09.018487087 -0400
-@@ -186,7 +186,7 @@
- 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
--	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-+	    -e 's#\$(CFLAGS)##'`
- 
-     if test $library = 'kdb'; then
- 	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
-@@ -214,9 +214,13 @@
-     fi
- 
-     if test $library = 'krb5'; then
--	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
-     fi
- 
-+    # If we ever support a flag to generate output suitable for static
-+    # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
-+    # here.
-+
-     echo $lib_flags
- fi
- 
diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind
deleted file mode 100644
index 04df0dcff..000000000
--- a/testing/krb5/krb5-kadmind
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Admin Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kadmind
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Admin Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc
deleted file mode 100644
index 05a03411e..000000000
--- a/testing/krb5/krb5-kdc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/krb5kdc`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Authentication"
-        if [ -z "$PID" ]; then
-           /usr/sbin/krb5kdc
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Authentication"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/testing/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/less/PKGBUILD b/testing/less/PKGBUILD
deleted file mode 100644
index 15b855a33..000000000
--- a/testing/less/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141923 2011-11-03 07:35:28Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=less
-pkgver=444
-pkgrel=2
-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=('56f9f76ffe13f70155f47f6b3c87d421'
-         'd5fafbd94a9cfdeaad0c82143a033fe5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}"/usr install
-  install -dm755 "${pkgdir}"/bin
-  mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin
-}
diff --git a/testing/libcap/PKGBUILD b/testing/libcap/PKGBUILD
deleted file mode 100644
index fd51da547..000000000
--- a/testing/libcap/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-#$Id: PKGBUILD 141933 2011-11-03 09:57:57Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libcap
-pkgver=2.22
-pkgrel=2
-pkgdesc="POSIX 1003.1e capabilities"
-arch=('i686' 'x86_64')
-url="http://sites.google.com/site/fullycapable/"
-license=('GPL2')
-depends=('glibc' 'attr')
-source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz{,.asc})
-md5sums=('b4896816b626bea445f0b3849bdd4077'
-         '9d0983e25e5a251d098507f9561d2b27')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=/usr DESTDIR=${pkgdir} LIBDIR=${pkgdir}/lib RAISE_SETFCAP=no install
-  rm ${pkgdir}/lib/*.a
-  chmod 755 ${pkgdir}/lib/libcap.so.${pkgver}
-}
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 783c417cf..000000000
--- a/testing/libdrm/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 141378 2011-10-30 08:49:20Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libdrm
-pkgver=2.4.27
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo')
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        no-pthread-stubs.patch
-        COPYING)
-md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd'
-         'c722c8406507b7e3a8da7a3030d1d9cf'
-         'ba65e71c481b94ef0fb6c23c7f21ffa1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
-  
-#  libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-intel \
-      --enable-radeon \
-      --enable-vmwgfx-experimental-api \
-      --enable-nouveau-experimental-api
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -k check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 348c2a795..000000000
--- a/testing/libdrm/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)
--
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- AC_SUBST(PCIACCESS_CFLAGS)
- AC_SUBST(PCIACCESS_LIBS)
---- 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,14 +26,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
- 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_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
- 
- libdrm_intel_la_SOURCES = \
- 	intel_bufmgr.c \
---- 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/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch b/testing/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch
deleted file mode 100644
index 1fce472b7..000000000
--- a/testing/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-From bc937fc4ff6715e9bee939041fa02be0755d7d58 Mon Sep 17 00:00:00 2001
-From: Guy Harris <guy@alum.mit.edu>
-Date: Sat, 13 Nov 2010 17:42:47 -0800
-Subject: [PATCH] Add support for libnl 2.x, adapted from a newer version of the iw command.
-
----
- config.h.in  |    3 ++
- configure    |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- configure.in |   40 ++++++++++++++++++----
- pcap-linux.c |   58 ++++++++++++++++++++++++-------
- 4 files changed, 184 insertions(+), 25 deletions(-)
-
-diff --git a/config.h.in b/config.h.in
-index f988e8f..3b9ce3c 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -52,6 +52,9 @@
- /* if libnl exists */
- #undef HAVE_LIBNL
- 
-+/* if libnl exists and is version 2.x */
-+#undef HAVE_LIBNL_2_x
-+
- /* Define to 1 if you have the <limits.h> header file. */
- #undef HAVE_LIMITS_H
- 
-diff --git a/configure b/configure
-index c99c1ab..7338dee 100755
---- a/configure
-+++ b/configure
-@@ -7340,7 +7340,93 @@ fi
- 
- 
- 	if test x$with_libnl != xno ; then
--		{ echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5
-+		#
-+		# Try libnl 2.x first.
-+		#
-+		{ echo "$as_me:$LINENO: checking for nl_socket_alloc in -lnl" >&5
-+echo $ECHO_N "checking for nl_socket_alloc in -lnl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nl_nl_socket_alloc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char nl_socket_alloc ();
-+int
-+main ()
-+{
-+return nl_socket_alloc ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_nl_nl_socket_alloc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_nl_nl_socket_alloc=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_socket_alloc" >&5
-+echo "${ECHO_T}$ac_cv_lib_nl_nl_socket_alloc" >&6; }
-+if test $ac_cv_lib_nl_nl_socket_alloc = yes; then
-+
-+			#
-+			# Yes, we have libnl 2.x.
-+			#
-+			LIBS="-lnl-genl -lnl $LIBS"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBNL 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBNL_2_x 1
-+_ACEOF
-+
-+
-+else
-+
-+			#
-+			# No, we don't; do we have libnl 1.x?
-+			#
-+			{ echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5
- echo $ECHO_N "checking for nl_handle_alloc in -lnl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nl_nl_handle_alloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7402,18 +7488,30 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_handle_alloc" >&5
- echo "${ECHO_T}$ac_cv_lib_nl_nl_handle_alloc" >&6; }
- if test $ac_cv_lib_nl_nl_handle_alloc = yes; then
--  LIBS="-lnl $LIBS"
-+
-+				#
-+				# Yes.
-+				#
-+				LIBS="-lnl $LIBS"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBNL 1
- _ACEOF
- 
-+
- else
--  if test x$with_libnl = xyes ; then
--				{ { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5
-+
-+				#
-+				# No, we don't have libnl at all.
-+				#
-+				if test x$with_libnl = xyes ; then
-+					{ { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5
- echo "$as_me: error: libnl support requested but libnl not found" >&2;}
-    { (exit 1); exit 1; }; }
--			fi
-+				fi
-+
-+fi
-+
- 
- fi
- 
-diff --git a/configure.in b/configure.in
-index 16eadf9..ef801ed 100644
---- a/configure.in
-+++ b/configure.in
-@@ -445,13 +445,39 @@ linux)
- 		with_libnl=$withval,,)
- 
- 	if test x$with_libnl != xno ; then
--		AC_CHECK_LIB(nl, nl_handle_alloc,
--			LIBS="-lnl $LIBS"
--			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]),
--			if test x$with_libnl = xyes ; then
--				AC_MSG_ERROR([libnl support requested but libnl not found])
--			fi
--		)
-+		#
-+		# Try libnl 2.x first.
-+		#
-+		AC_CHECK_LIB(nl, nl_socket_alloc,
-+		[
-+			#
-+			# Yes, we have libnl 2.x.
-+			#
-+			LIBS="-lnl-genl -lnl $LIBS"
-+			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
-+			AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
-+		],
-+		[
-+			#
-+			# No, we don't; do we have libnl 1.x?
-+			#
-+			AC_CHECK_LIB(nl, nl_handle_alloc,
-+			[
-+				#
-+				# Yes.
-+				#
-+				LIBS="-lnl $LIBS"
-+				AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
-+			],
-+			[
-+				#
-+				# No, we don't have libnl at all.
-+				#
-+				if test x$with_libnl = xyes ; then
-+					AC_MSG_ERROR([libnl support requested but libnl not found])
-+				fi
-+			])
-+		])
- 	fi
- 
- 	AC_LBL_TPACKET_STATS
-diff --git a/pcap-linux.c b/pcap-linux.c
-index f8b3f10..deabbc4 100644
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -527,8 +527,37 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path,
- 	return 1;
- }
- 
-+#ifndef HAVE_LIBNL_2_x
-+/* libnl 2.x compatibility code */
-+
-+#define nl_sock nl_handle
-+
-+static inline struct nl_handle *
-+nl_socket_alloc(void)
-+{
-+	return nl_handle_alloc();
-+}
-+
-+static inline void
-+nl_socket_free(struct nl_handle *h)
-+{
-+	nl_handle_destroy(h);
-+}
-+
-+static inline int
-+__genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache)
-+{
-+	struct nl_cache *tmp = genl_ctrl_alloc_cache(h);
-+	if (!tmp)
-+		return -ENOMEM;
-+	*cache = tmp;
-+	return 0;
-+}
-+#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
-+#endif /* !HAVE_LIBNL_2_x */
-+
- struct nl80211_state {
--	struct nl_handle *nl_handle;
-+	struct nl_sock *nl_sock;
- 	struct nl_cache *nl_cache;
- 	struct genl_family *nl80211;
- };
-@@ -536,23 +565,26 @@ struct nl80211_state {
- static int
- nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device)
- {
--	state->nl_handle = nl_handle_alloc();
--	if (!state->nl_handle) {
-+	int err;
-+
-+	state->nl_sock = nl_socket_alloc();
-+	if (!state->nl_sock) {
- 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- 		    "%s: failed to allocate netlink handle", device);
- 		return PCAP_ERROR;
- 	}
- 
--	if (genl_connect(state->nl_handle)) {
-+	if (genl_connect(state->nl_sock)) {
- 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- 		    "%s: failed to connect to generic netlink", device);
- 		goto out_handle_destroy;
- 	}
- 
--	state->nl_cache = genl_ctrl_alloc_cache(state->nl_handle);
--	if (!state->nl_cache) {
-+	err = genl_ctrl_alloc_cache(state->nl_sock, &state->nl_cache);
-+	if (err < 0) {
- 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
--		    "%s: failed to allocate generic netlink cache", device);
-+		    "%s: failed to allocate generic netlink cache: %s",
-+		    device, strerror(-err));
- 		goto out_handle_destroy;
- 	}
- 
-@@ -568,7 +600,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device)
- out_cache_free:
- 	nl_cache_free(state->nl_cache);
- out_handle_destroy:
--	nl_handle_destroy(state->nl_handle);
-+	nl_socket_free(state->nl_sock);
- 	return PCAP_ERROR;
- }
- 
-@@ -577,7 +609,7 @@ nl80211_cleanup(struct nl80211_state *state)
- {
- 	genl_family_put(state->nl80211);
- 	nl_cache_free(state->nl_cache);
--	nl_handle_destroy(state->nl_handle);
-+	nl_socket_free(state->nl_sock);
- }
- 
- static int
-@@ -605,7 +637,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 	NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, mondevice);
- 	NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_MONITOR);
- 
--	err = nl_send_auto_complete(state->nl_handle, msg);
-+	err = nl_send_auto_complete(state->nl_sock, msg);
- 	if (err < 0) {
- 		if (err == -ENFILE) {
- 			/*
-@@ -626,7 +658,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 			return PCAP_ERROR;
- 		}
- 	}
--	err = nl_wait_for_ack(state->nl_handle);
-+	err = nl_wait_for_ack(state->nl_sock);
- 	if (err < 0) {
- 		if (err == -ENFILE) {
- 			/*
-@@ -685,7 +717,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 		    0, NL80211_CMD_DEL_INTERFACE, 0);
- 	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
- 
--	err = nl_send_auto_complete(state->nl_handle, msg);
-+	err = nl_send_auto_complete(state->nl_sock, msg);
- 	if (err < 0) {
- 		if (err == -ENFILE) {
- 			/*
-@@ -706,7 +738,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 			return PCAP_ERROR;
- 		}
- 	}
--	err = nl_wait_for_ack(state->nl_handle);
-+	err = nl_wait_for_ack(state->nl_sock);
- 	if (err < 0) {
- 		if (err == -ENFILE) {
- 			/*
--- 
-1.7.3.5
-
diff --git a/testing/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch b/testing/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch
deleted file mode 100644
index 219494200..000000000
--- a/testing/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 9545ff8e2670db02652f9cf781aafdd6bac58ac4 Mon Sep 17 00:00:00 2001
-From: Guy Harris <guy@alum.mit.edu>
-Date: Sun, 14 Nov 2010 13:48:19 -0800
-Subject: [PATCH] Libnl 2.x returns its own error codes, not errnos; handle that.
-
-While we're at it, don't special-case ENFILE for "delete monitor device"
-operations; that's not like "add monitor device", where we want to drive
-on if a device with that name already exists.
----
- pcap-linux.c |   76 ++++++++++++++++++++++++++--------------------------------
- 1 files changed, 34 insertions(+), 42 deletions(-)
-
-diff --git a/pcap-linux.c b/pcap-linux.c
-index deabbc4..5d291e9 100644
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -527,7 +527,9 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path,
- 	return 1;
- }
- 
--#ifndef HAVE_LIBNL_2_x
-+#ifdef HAVE_LIBNL_2_x
-+#define get_nl_errmsg	nl_geterror
-+#else
- /* libnl 2.x compatibility code */
- 
- #define nl_sock nl_handle
-@@ -544,6 +546,8 @@ nl_socket_free(struct nl_handle *h)
- 	nl_handle_destroy(h);
- }
- 
-+#define get_nl_errmsg	strerror
-+
- static inline int
- __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache)
- {
-@@ -584,7 +588,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device)
- 	if (err < 0) {
- 		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- 		    "%s: failed to allocate generic netlink cache: %s",
--		    device, strerror(-err));
-+		    device, get_nl_errmsg(-err));
- 		goto out_handle_destroy;
- 	}
- 
-@@ -639,10 +643,17 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 
- 	err = nl_send_auto_complete(state->nl_sock, msg);
- 	if (err < 0) {
-+#ifdef HAVE_LIBNL_2_x
-+		if (err == -NLE_FAILURE) {
-+#else
- 		if (err == -ENFILE) {
-+#endif
- 			/*
- 			 * Device not available; our caller should just
--			 * keep trying.
-+			 * keep trying.  (libnl 2.x maps ENFILE to
-+			 * NLE_FAILURE; it can also map other errors
-+			 * to that, but there's not much we can do
-+			 * about that.)
- 			 */
- 			nlmsg_free(msg);
- 			return 0;
-@@ -653,17 +664,24 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 			 */
- 			snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- 			    "%s: nl_send_auto_complete failed adding %s interface: %s",
--			    device, mondevice, strerror(-err));
-+			    device, mondevice, get_nl_errmsg(-err));
- 			nlmsg_free(msg);
- 			return PCAP_ERROR;
- 		}
- 	}
- 	err = nl_wait_for_ack(state->nl_sock);
- 	if (err < 0) {
-+#ifdef HAVE_LIBNL_2_x
-+		if (err == -NLE_FAILURE) {
-+#else
- 		if (err == -ENFILE) {
-+#endif
- 			/*
- 			 * Device not available; our caller should just
--			 * keep trying.
-+			 * keep trying.  (libnl 2.x maps ENFILE to
-+			 * NLE_FAILURE; it can also map other errors
-+			 * to that, but there's not much we can do
-+			 * about that.)
- 			 */
- 			nlmsg_free(msg);
- 			return 0;
-@@ -674,7 +692,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 			 */
- 			snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- 			    "%s: nl_wait_for_ack failed adding %s interface: %s",
--			    device, mondevice, strerror(-err));
-+			    device, mondevice, get_nl_errmsg(-err));
- 			nlmsg_free(msg);
- 			return PCAP_ERROR;
- 		}
-@@ -719,45 +737,19 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 
- 	err = nl_send_auto_complete(state->nl_sock, msg);
- 	if (err < 0) {
--		if (err == -ENFILE) {
--			/*
--			 * Device not available; our caller should just
--			 * keep trying.
--			 */
--			nlmsg_free(msg);
--			return 0;
--		} else {
--			/*
--			 * Real failure, not just "that device is not
--			 * available.
--			 */
--			snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
--			    "%s: nl_send_auto_complete failed deleting %s interface: %s",
--			    device, mondevice, strerror(-err));
--			nlmsg_free(msg);
--			return PCAP_ERROR;
--		}
-+		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-+		    "%s: nl_send_auto_complete failed deleting %s interface: %s",
-+		    device, mondevice, get_nl_errmsg(-err));
-+		nlmsg_free(msg);
-+		return PCAP_ERROR;
- 	}
- 	err = nl_wait_for_ack(state->nl_sock);
- 	if (err < 0) {
--		if (err == -ENFILE) {
--			/*
--			 * Device not available; our caller should just
--			 * keep trying.
--			 */
--			nlmsg_free(msg);
--			return 0;
--		} else {
--			/*
--			 * Real failure, not just "that device is not
--			 * available.
--			 */
--			snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
--			    "%s: nl_wait_for_ack failed adding %s interface: %s",
--			    device, mondevice, strerror(-err));
--			nlmsg_free(msg);
--			return PCAP_ERROR;
--		}
-+		snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-+		    "%s: nl_wait_for_ack failed adding %s interface: %s",
-+		    device, mondevice, get_nl_errmsg(-err));
-+		nlmsg_free(msg);
-+		return PCAP_ERROR;
- 	}
- 
- 	/*
--- 
-1.7.3.5
-
diff --git a/testing/libpcap/PKGBUILD b/testing/libpcap/PKGBUILD
deleted file mode 100644
index ee36e3354..000000000
--- a/testing/libpcap/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 141970 2011-11-03 18:57:47Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=libpcap
-pkgver=1.1.1
-pkgrel=4
-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')
-makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz)
-        #Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch
-        #Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch)
-sha256sums=('508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85')
-            #'194aa268a3397be3ba406b7102dbdbc14fc16c6e4b535d0a0fab6b04d414563a'
-            #'f1f31c3e2b064f4c9d0e643e8ed1874a65ec17f770362f8ffa3b3f9ee9dc71bb')
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  #patch -p1 -i "${srcdir}"/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch
-  #patch -p1 -i "${srcdir}"/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch
-  ./configure --prefix=/usr --enable-ipv6
-  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/libpipeline/PKGBUILD b/testing/libpipeline/PKGBUILD
deleted file mode 100644
index e90478973..000000000
--- a/testing/libpipeline/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 141732 2011-11-02 16:22:06Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=libpipeline
-pkgver=1.2.0
-pkgrel=2
-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=('dd3a987a0d2b594716baee2f73d61ae3')
-
-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/libusb/PKGBUILD b/testing/libusb/PKGBUILD
deleted file mode 100644
index f99afb302..000000000
--- a/testing/libusb/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 141981 2011-11-03 20:12:06Z tpowa $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=libusb
-pkgver=1.0.8
-pkgrel=2
-depends=('glibc')
-pkgdesc="Library to enable user space application programs to communicate with USB devices."
-arch=(i686 x86_64)
-url="http://libusb.sourceforge.net/"
-license=('LGPL')
-source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2)
-options=(!libtool)
-replaces=(libusb1)
-md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef')
-
-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/lirc/PKGBUILD b/testing/lirc/PKGBUILD
deleted file mode 100644
index 1cb1dfb32..000000000
--- a/testing/lirc/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 141190 2011-10-25 18:44:15Z thomas $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=8
-epoch=1
-_extramodules=extramodules-3.1-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-makedepends=('help2man' 'linux-headers>=3.1' 'linux-headers<3.2' '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() {
-  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.1' 'linux<3.2')
-  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 1e7c4f4a1..000000000
--- a/testing/lirc/lirc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRAMODULES=extramodules-3.1-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/m4/PKGBUILD b/testing/m4/PKGBUILD
deleted file mode 100644
index 917fbdad3..000000000
--- a/testing/m4/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 141937 2011-11-03 10:57:23Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=m4
-pkgver=1.4.16
-pkgrel=2
-pkgdesc="The GNU macro processor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/m4"
-license=('GPL3')
-groups=('base-devel')
-depends=('glibc' 'bash')
-install=m4.install
-source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
-        m4-1.4.16-readlink-einval.patch)
-md5sums=('7548ec061a1ba993790159764f522d0e'
-         'eebe5c94e74e7551e2e30c5844f1b653'
-         'cea138fa9b568d06e46269611cec8dd0')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
-  ./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/m4/m4-1.4.16-readlink-einval.patch b/testing/m4/m4-1.4.16-readlink-einval.patch
deleted file mode 100644
index 6a987510d..000000000
--- a/testing/m4/m4-1.4.16-readlink-einval.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h
---- m4-1.4.16/tests/test-readlink.h.orig	2011-09-19 12:44:58.745546826 +0200
-+++ m4-1.4.16/tests/test-readlink.h	2011-09-19 12:46:00.079548410 +0200
-@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
-   ASSERT (errno == ENOENT);
-   errno = 0;
-   ASSERT (func ("", buf, sizeof buf) == -1);
--  ASSERT (errno == ENOENT);
-+  ASSERT (errno == ENOENT || errno == EINVAL);
-   errno = 0;
-   ASSERT (func (".", buf, sizeof buf) == -1);
-   ASSERT (errno == EINVAL);
diff --git a/testing/m4/m4.install b/testing/m4/m4.install
deleted file mode 100644
index be4138170..000000000
--- a/testing/m4/m4.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(m4.info m4.info-1 m4.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/mediastreamer/PKGBUILD b/testing/mediastreamer/PKGBUILD
deleted file mode 100644
index e1a2b09f3..000000000
--- a/testing/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 142151 2011-11-05 11:38:00Z 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.7.3
-pkgrel=4
-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' 'v4l-utils' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "disable-v4l1.patch")
-md5sums=('5213307f557d86aa648f1a53a885138c'
-         '7ee15689eed1adbdcf0ddab8fadca34a')
-options=('!libtool')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver/
-  patch -p2 -i "${srcdir}"/disable-v4l1.patch
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib/mediastreamer/
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mediastreamer/disable-v4l1.patch b/testing/mediastreamer/disable-v4l1.patch
deleted file mode 100644
index 9f6cb84d4..000000000
--- a/testing/mediastreamer/disable-v4l1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am	2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
- 
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
- 
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in	2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in	2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- 	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- 	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- 	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
--	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- 	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- 	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- 	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@	drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/testing/miro/PKGBUILD b/testing/miro/PKGBUILD
deleted file mode 100644
index 7219c5476..000000000
--- a/testing/miro/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 142153 2011-11-05 11:38:04Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=4.0.3
-pkgrel=2
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
-         'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
-         'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
-         'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' 
-         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
-makedepends=('pkg-config')
-install=miro.install
-options=('!makeflags')
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
-        'ffmpeg.patch')
-sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840'
-          'f0c851d51318c0e0be8b91463ef901625d2587a9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/ffmpeg.patch"
-  cd linux
-
-  python2 setup.py install --root="${pkgdir}"
-
-  # fix miro startup script so --debug works with python2
-  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
-  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-}
diff --git a/testing/miro/ffmpeg.patch b/testing/miro/ffmpeg.patch
deleted file mode 100644
index edf378459..000000000
--- a/testing/miro/ffmpeg.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
---- miro-4.0.old/linux/miro-segmenter.c	2011-05-25 15:58:21.000000000 +0200
-+++ miro-4.0/linux/miro-segmenter.c	2011-05-25 16:09:41.000000000 +0200
-@@ -60,7 +60,7 @@
-     }
- 
-     switch (input_codec_context->codec_type) {
--        case CODEC_TYPE_AUDIO:
-+        case AVMEDIA_TYPE_AUDIO:
-             output_codec_context->channel_layout = input_codec_context->channel_layout;
-             output_codec_context->sample_rate = input_codec_context->sample_rate;
-             output_codec_context->channels = input_codec_context->channels;
-@@ -72,7 +72,7 @@
-                 output_codec_context->block_align = input_codec_context->block_align;
-             }
-             break;
--        case CODEC_TYPE_VIDEO:
-+        case AVMEDIA_TYPE_VIDEO:
-             output_codec_context->pix_fmt = input_codec_context->pix_fmt;
-             output_codec_context->width = input_codec_context->width;
-             output_codec_context->height = input_codec_context->height;
-@@ -154,7 +154,7 @@
-         exit(1);
-     }
- 
--    ofmt = guess_format("mpegts", NULL, NULL);
-+    ofmt = av_guess_format("mpegts", NULL, NULL);
-     if (!ofmt) {
-         fprintf(stderr, "Could not find MPEG-TS muxer\n");
-         exit(1);
-@@ -174,12 +174,12 @@
- 
-     for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
-         switch (ic->streams[i]->codec->codec_type) {
--            case CODEC_TYPE_VIDEO:
-+            case AVMEDIA_TYPE_VIDEO:
-                 video_index = i;
-                 ic->streams[i]->discard = AVDISCARD_NONE;
-                 video_st = add_output_stream(oc, ic->streams[i]);
-                 break;
--            case CODEC_TYPE_AUDIO:
-+            case AVMEDIA_TYPE_AUDIO:
-                 audio_index = i;
-                 ic->streams[i]->discard = AVDISCARD_NONE;
-                 audio_st = add_output_stream(oc, ic->streams[i]);
-@@ -195,7 +195,7 @@
-         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);
-@@ -208,7 +208,7 @@
-         }
-     }
- 
--    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+    if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
-         fprintf(stderr, "Could not open '%s'\n", output_filename);
-         exit(1);
-     }
-@@ -234,7 +234,7 @@
-             break;
-         }
- 
--        if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
-+        if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
-             segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
-         }
-         else if (video_index < 0) {
-@@ -245,10 +245,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, URL_WRONLY) < 0) {
-                 fprintf(stderr, "Could not open '%s'\n", output_filename);
-                 break;
-             }
-@@ -278,7 +278,7 @@
-         av_freep(&oc->streams[i]);
-     }
- 
--    url_fclose(oc->pb);
-+    avio_close(oc->pb);
-     av_free(oc);
- 
-     return 0;
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/mlocate/PKGBUILD b/testing/mlocate/PKGBUILD
deleted file mode 100644
index aa7c002f3..000000000
--- a/testing/mlocate/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 141941 2011-11-03 11:28:39Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: lydgate
-
-pkgname=mlocate
-pkgver=0.24
-pkgrel=2
-pkgdesc="Faster merging drop-in for slocate"
-arch=('i686' 'x86_64')
-url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate"
-license=('GPL')
-conflicts=('slocate')
-provides=('slocate')
-replaces=('slocate')
-depends=('glibc' 'coreutils' 'sh')
-backup=('etc/updatedb.conf'
-        'etc/cron.daily/updatedb')
-install=mlocate.install
-source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
-	updatedb.conf
-	updatedb.cron.daily)
-md5sums=('a9c221e5bc489a2ed710c943990137bd'
-         'c374ff223f2e07b5e602ba22359f2335'
-         'cde5da81bebad2de556ef2e43d895e13')
-
-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
-  
-  # Set up a default updatedb.conf and a daily cronjob
-  install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
-  install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
-
-  # Install Mlocate
-  make DESTDIR=$pkgdir install
-
-  ln -sv locate $pkgdir/usr/bin/slocate
-  chgrp -v 21 $pkgdir/usr/bin/locate
-  chmod -v 2755 $pkgdir/usr/bin/locate
-
-  install -dm755 $pkgdir/var/lib
-  install -d -m750 -g21 $pkgdir/var/lib/locate
-}
diff --git a/testing/mlocate/mlocate.install b/testing/mlocate/mlocate.install
deleted file mode 100644
index c7b7f9cf7..000000000
--- a/testing/mlocate/mlocate.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade "$1" "$1"
-  echo "mlocate command is technically locate, but slocate is symlinked and still works."
-  echo "You should run updatedb as root."
-}
-
-post_upgrade() {
-  # This can be removed after {m,x}locate have both been updated
-  getent group slocate &>/dev/null && usr/sbin/groupdel slocate &>/dev/null
-  getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null
-
-  getent group locate &>/dev/null || usr/sbin/groupadd -g 21 locate &>/dev/null
-  chown -R root:locate var/lib/mlocate
-}
-
-pre_remove() {
-  getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null
-}
diff --git a/testing/mlocate/updatedb.conf b/testing/mlocate/updatedb.conf
deleted file mode 100644
index 722b04205..000000000
--- a/testing/mlocate/updatedb.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# directories to exclude from the slocate database:
-PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
-
-# filesystems to exclude from the slocate database:
-PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs sshfs sysfs tmpfs udf usbfs vboxsf"
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 e7412df83..000000000
--- a/testing/moc/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 142155 2011-11-05 11:38:06Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=moc
-pkgver=20110528
-pkgrel=4
-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 \
-        gcc-undefined-symbols.diff moc-ffmpeg.patch)
-sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
-          'a811a4ac7e049914aab528d3f06a6be6634c2720'
-          'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p0 -i ../gcc-undefined-symbols.diff
-  patch -p0 -i ../moc-ffmpeg.patch
-
-# Disabling aac to use the external ffmpeg to play them (FS#13164)
-  ./autogen.sh
-  ./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}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/moc/gcc-undefined-symbols.diff b/testing/moc/gcc-undefined-symbols.diff
deleted file mode 100644
index 09e9b8bda..000000000
--- a/testing/moc/gcc-undefined-symbols.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- decoder.c~	2011-05-08 09:28:28.077137883 +0200
-+++ decoder.c	2011-05-10 21:40:48.887941968 +0200
-@@ -259,6 +259,9 @@
- 	for (i = 0; i < plugins_num; i++)
- 		if (plugins[i].decoder->destroy)
- 			plugins[i].decoder->destroy ();
-+	for (i = 0; i < plugins_num; i++)
-+		if (plugins[i].handle)
-+                    lt_dlclose(plugins[i].handle);
- 
- 	if (lt_dlexit())
- 		logit ("lt_exit() failed: %s", lt_dlerror());
diff --git a/testing/moc/moc-ffmpeg.patch b/testing/moc/moc-ffmpeg.patch
deleted file mode 100644
index 7554ea14e..000000000
--- a/testing/moc/moc-ffmpeg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2307)
-+++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
-@@ -28,12 +28,6 @@
- #include <ffmpeg/avformat.h>
- #endif
- 
--/* libavformat's API will be changing at version 53, but at present there
-- * appears to be no guidance on what will replace the deprecated fields. */
--#ifndef FF_API_OLD_METADATA
--#define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
--#endif
--
- /* FFmpeg also likes common names, without that, our common.h and log.h
-  * would not be included. */
- #undef COMMON_H
-@@ -137,7 +131,7 @@
- 	av_read_play (data->ic);
- 	for (i = 0; i < data->ic->nb_streams; i++) {
- 		data->enc = data->ic->streams[i]->codec;
--		if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
-+		if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
- 			audio_index = i;
- 			break;
- 		}
diff --git a/testing/module-init-tools/PKGBUILD b/testing/module-init-tools/PKGBUILD
deleted file mode 100644
index 587af1307..000000000
--- a/testing/module-init-tools/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 142090 2011-11-05 00:45:30Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=module-init-tools
-pkgver=3.16
-pkgrel=2
-pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules"
-arch=('i686' 'x86_64')
-url="https://modules.wiki.kernel.org"
-license=('GPL')
-depends=('glibc')
-makedepends=('docbook2x')
-backup=('etc/modprobe.d/modprobe.conf')
-source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2"
-        modprobe.conf
-        docfix.patch)
-md5sums=('bc44832c6e41707b8447e2847d2019f5'
-         '325657db471b3190f685e5a89c9b90e3'
-         '4320d19902ded43bed55c804b065cdc7')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # fix headers in SGML manpage sources and an XML typo
-  patch -Np0 < "$srcdir/docfix.patch"
-
-  ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR=$pkgdir install
-
-  # extra modprobe.d conf dir
-  install -dm755 "$pkgdir/lib/modprobe.d"
-
-  # Install our custom (read: empty) modprobe.conf
-  install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf"
-}
diff --git a/testing/module-init-tools/docfix.patch b/testing/module-init-tools/docfix.patch
deleted file mode 100644
index 0151ca3f1..000000000
--- a/testing/module-init-tools/docfix.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/depmod.conf.sgml.orig	2011-06-25 10:07:15.897805024 -0400
-+++ doc/depmod.conf.sgml	2011-06-25 10:07:48.810805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/depmod.sgml.orig	2011-06-25 10:07:15.898805024 -0400
-+++ doc/depmod.sgml	2011-06-25 10:07:56.636805021 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
-@@ -52,7 +52,7 @@
-       <arg><option>-n</option></arg>
-       <arg><option>-v</option></arg>
-       <arg><option>-P <replaceable>prefix</replaceable></option></arg>
--      <arg><option>-w</option><arg>
-+      <arg><option>-w</option></arg>
-       <arg><option><replaceable>version</replaceable></option></arg>
-       <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg>
-     </cmdsynopsis>
---- doc/insmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
-+++ doc/insmod.sgml	2011-06-25 10:07:59.228805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/lsmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
-+++ doc/lsmod.sgml	2011-06-25 10:08:04.804805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modinfo.sgml.orig	2011-06-25 10:07:15.900805024 -0400
-+++ doc/modinfo.sgml	2011-06-25 10:08:07.630805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modprobe.conf.sgml.orig	2011-06-25 10:07:15.901805024 -0400
-+++ doc/modprobe.conf.sgml	2011-06-25 10:08:10.173805018 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modprobe.sgml.orig	2011-06-25 10:07:15.902805024 -0400
-+++ doc/modprobe.sgml	2011-06-25 10:08:13.623805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/modules.dep.sgml.orig	2011-06-25 10:07:15.903805024 -0400
-+++ doc/modules.dep.sgml	2011-06-25 10:08:19.323805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
---- doc/rmmod.sgml.orig	2011-06-25 10:07:15.904805024 -0400
-+++ doc/rmmod.sgml	2011-06-25 10:08:27.691805017 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
-   <!ENTITY docbook "<productname>DocBook</productname>">
-   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
diff --git a/testing/module-init-tools/modprobe.conf b/testing/module-init-tools/modprobe.conf
deleted file mode 100644
index 551bdfbdf..000000000
--- a/testing/module-init-tools/modprobe.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# /etc/modprobe.d/modprobe.conf
-#
diff --git a/testing/mpd/ChangeLog b/testing/mpd/ChangeLog
deleted file mode 100644
index 40ba5e4e7..000000000
--- a/testing/mpd/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2011-09-03 Angel Velasquez <angvp@archlinux.org>
-    * Version bump to 0.16.4
-    * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
-
-2011-06-25 Angel Velasquez <angvp@archlinux.org>
-    * Added a patch for bug with ffmpeg FS#24839 
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD
deleted file mode 100644
index 5621f15db..000000000
--- a/testing/mpd/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 142157 2011-11-05 11:38:08Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.16.5
-pkgrel=2
-pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://mpd.wikia.com/wiki/Server"
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
-makedepends=('pkgconfig' 'doxygen')
-install=${pkgname}.install
-changelog=ChangeLog
-source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2"
-'mpd') 
-md5sums=('f7564cff12035f6a1112cce770655df7'
-         'e5669c2bff4031928531e52475addeb1')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-lastfm \
-    --enable-jack \
-    --enable-pulse \
-    --enable-documentation \
-    --disable-libwrap \
-    --disable-cue \
-    --disable-sidplay \
-    --with-systemdsystemunitdir=/lib/systemd/system
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # set our dirs in mpd.conf file
-  sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
-  sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
-  sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
-  sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
-  sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
-  sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
-  sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
-  sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
-
-  install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example"
-
-  install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd"
-  install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd}
-}
diff --git a/testing/mpd/mpd b/testing/mpd/mpd
deleted file mode 100755
index 6134e2ed4..000000000
--- a/testing/mpd/mpd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Music Player Daemon"
-    [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
-    /usr/bin/mpd /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Music Player Daemon"
-    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mpd/mpd.install b/testing/mpd/mpd.install
deleted file mode 100644
index 885505a07..000000000
--- a/testing/mpd/mpd.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade
-  echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
-}
-
-post_upgrade() {
-  getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
-  getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
-  for dir in /var/{lib,log}/mpd; do
-    chown -R mpd:mpd "$dir" 1>/dev/null
-  done
-}
-
-post_remove() {
-  getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
-  getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
-  [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
-}
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
deleted file mode 100644
index 42755ee8e..000000000
--- a/testing/mpfr/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 142238 2011-11-07 03:27:16Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=mpfr
-_pkgver=3.1.0
-_patchlevel=p3
-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=('6e495841bb026481567006cec0f821c3'
-         '293374ee4b01527f8f7889fdfa9016f8'
-         'd65858ccddbea968d6580124320fb6a0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
-  ./configure --prefix=/usr --enable-thread-safe --enable-shared
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mpfr/mpfr-3.1.0.p3.patch b/testing/mpfr/mpfr-3.1.0.p3.patch
deleted file mode 100644
index 16d944047..000000000
--- a/testing/mpfr/mpfr-3.1.0.p3.patch
+++ /dev/null
@@ -1,393 +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 --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/nano/PKGBUILD b/testing/nano/PKGBUILD
deleted file mode 100644
index f7459212d..000000000
--- a/testing/nano/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141730 2011-11-02 16:18:21Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Judd <judd@archlinux.org>
-
-pkgname=nano
-pkgver=2.2.6
-pkgrel=2
-pkgdesc="Pico editor clone with enhancements"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.nano-editor.org"
-groups=('base')
-depends=('ncurses' 'sh')
-backup=('etc/nanorc')
-install=nano.install
-source=(http://www.nano-editor.org/dist/v2.2/${pkgname}-${pkgver}.tar.gz)
-md5sums=('03233ae480689a008eb98feb1b599807')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-color \
-    --enable-nanorc \
-    --enable-multibuffer \
-    --disable-wrapping-as-root
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -DTm644 ${srcdir}/${pkgname}-${pkgver}/doc/nanorc.sample ${pkgdir}/etc/nanorc
-}
diff --git a/testing/nano/nano.install b/testing/nano/nano.install
deleted file mode 100644
index a320c40d8..000000000
--- a/testing/nano/nano.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(nano.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/ncurses/PKGBUILD b/testing/ncurses/PKGBUILD
deleted file mode 100644
index 1c2df2889..000000000
--- a/testing/ncurses/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 141943 2011-11-03 11:43:21Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=ncurses
-pkgver=5.9
-pkgrel=2
-pkgdesc="System V Release 4.0 curses emulation library"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/ncurses/"
-license=('MIT')
-depends=('glibc')
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1'
-         '014ffdbbfec6d41a9a89d6cbe6434638')
-
-build() {
-  cd ${srcdir}/
-  mkdir ncurses{,w}-build
-
-  cd ${srcdir}/ncursesw-build
-  ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
-     --with-shared --with-normal --without-debug --without-ada \
-     --with-install-prefix=${pkgdir} --enable-widec 
-  # add --enable-ext-colors with next soname bump
-  make
-
-  # libncurses.so.5 for external binary support 
-  cd ${srcdir}/ncurses-build
-  [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long"
-  ../${pkgname}-${pkgver}/configure --prefix=/usr \
-    --with-shared --with-normal --without-debug --without-ada \
-    --with-install-prefix=${pkgdir} $CONFIGFLAG
-  make
-}
-
-package() {
-  cd ${srcdir}/ncursesw-build
-  make install
-
-  # move libraries needed for boot to /lib (we call tput in initscripts)
-  install -dm755 ${pkgdir}/lib
-  mv ${pkgdir}/usr/lib/libncursesw.so.5* ${pkgdir}/lib
-  ln -sf ../../lib/libncursesw.so.5 ${pkgdir}/usr/lib/libncursesw.so
-
-  # Fool packages looking to link to non-wide-character ncurses libraries
-  for lib in curses ncurses form panel menu; do
-    rm -f ${pkgdir}/usr/lib/lib${lib}.so
-    echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so
-    ln -sf lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a
-  done
-  ln -sf libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a
-
-  # install tput to /bin
-  install -dm755 ${pkgdir}/bin/
-  mv ${pkgdir}/usr/bin/tput ${pkgdir}/bin/tput
-
-  # Some packages look for -lcurses during build
-  rm -f ${pkgdir}/usr/lib/libcursesw.so
-  echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so
-  ln -sf libncurses.so ${pkgdir}/usr/lib/libcurses.so
-  ln -sf libncursesw.a ${pkgdir}/usr/lib/libcursesw.a
-  ln -sf libncurses.a ${pkgdir}/usr/lib/libcurses.a
-
-  # non-widec compatibility library
-  cd ${srcdir}/ncurses-build        
-  install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.${pkgver}
-  ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5
-
-  # install license, rip it from the readme
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -dm755 ${pkgdir}/usr/share/licenses/$pkgname
-  grep -B 100 '$Id' README > ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD
deleted file mode 100644
index 24e6c701e..000000000
--- a/testing/net-tools/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 142021 2011-11-04 06:41:37Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=net-tools
-pkgver=1.60.20110819cvs
-pkgrel=3
-pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.tazenda.demon.co.uk/phil/net-tools"
-depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use cvs checkout instead
-source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2
-  net-tools-1.60-miiioctl.patch
-  net-tools-1.60-nameif_strncpy.patch)
-options=(!makeflags)
-install=net-tools.install
-sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf'
-          '654a96bc6575efb4a2e04b49de45d448d240eb6e'
-          '7888000d8fe867e58b5b00fe2bcf6c3041d716b4')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../net-tools-1.60-miiioctl.patch
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
-  yes "" | make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make BASEDIR=$pkgdir update
-
-  # the following is provided by yp-tools
-  rm "${pkgdir}"/bin/{nis,yp}domainname
-  rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
-
-  # hostname is provided by inetutils
-  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
-  rm -rf "${pkgdir}"/usr/share/man/man1
-}
diff --git a/testing/net-tools/gcc340.patch b/testing/net-tools/gcc340.patch
deleted file mode 100644
index 8089bf217..000000000
--- a/testing/net-tools/gcc340.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur net-tools-1.60-orig/hostname.c net-tools-1.60/hostname.c
---- net-tools-1.60-orig/hostname.c	2001-04-08 10:04:23.000000000 -0700
-+++ net-tools-1.60/hostname.c	2004-05-07 17:22:14.000000000 -0700
-@@ -78,6 +78,7 @@
-             fprintf(stderr, _("%s: name too long\n"), program_name);
-             break;
-         default:
-+	    ;
-         }
- 	exit(1);
-     }
-@@ -98,6 +99,7 @@
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
- 	default:
-+	    ;
- 	}
- 	exit(1);
-     };
-@@ -117,6 +119,7 @@
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
- 	default:
-+	    ;
- 	}
- 	exit(1);
-     };
-@@ -174,6 +177,7 @@
- 	printf("%s\n", hp->h_name);
- 	break;
-     default:
-+	;
-     }
- }
- 
-diff -Naur net-tools-1.60-orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
---- net-tools-1.60-orig/lib/inet_sr.c	2000-02-20 13:46:45.000000000 -0800
-+++ net-tools-1.60/lib/inet_sr.c	2004-05-07 17:20:14.000000000 -0700
-@@ -105,6 +105,7 @@
-     case 2:
-        isnet = 0; break;
-     default:
-+       ;
-     }
- 
-     /* Fill in the other fields. */
diff --git a/testing/net-tools/net-tools-1.60-2.6-compilefix.patch b/testing/net-tools/net-tools-1.60-2.6-compilefix.patch
deleted file mode 100644
index 92ce90128..000000000
--- a/testing/net-tools/net-tools-1.60-2.6-compilefix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
---- net-tools-1.60.orig/lib/x25_sr.c	2000-05-20 15:38:10.000000000 +0200
-+++ net-tools-1.60/lib/x25_sr.c	2003-10-18 20:33:31.927574928 +0200
-@@ -22,6 +22,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/x25.h>
-+#include <linux/version.h>
- #include <ctype.h>
- #include <errno.h>
- #include <netdb.h>
-@@ -77,7 +78,11 @@
-   rt.sigdigits=sigdigits;
- 
-   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-   memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+#else
-+  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
-+#endif
- 
-   while (*args) {
- 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
diff --git a/testing/net-tools/net-tools-1.60-miiioctl.patch b/testing/net-tools/net-tools-1.60-miiioctl.patch
deleted file mode 100644
index 6c7f0693d..000000000
--- a/testing/net-tools/net-tools-1.60-miiioctl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- net-tools-1.60.20110819cvs/include/mii.h	2011-08-19 10:14:00.743873299 +0200
-+++ net-tools-1.60.20110819cvs/include/mii.h.new	2011-08-19 10:28:26.500524160 +0200
-@@ -14,11 +14,9 @@
- /* network interface ioctl's for MII commands */
- #ifndef SIOCGMIIPHY
- #warning "SIOCGMIIPHY is not defined by your kernel source"
--#define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
--#define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
--#define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
--#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 	/* Read operational parameters */
--#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 	/* Set operational parameters */
-+#define SIOCGMIIPHY 0x8947     /* Read from current PHY */
-+#define SIOCGMIIREG 0x8948     /* Read any PHY register */
-+#define SIOCSMIIREG 0x8949     /* Write any PHY register */
- #endif
- 
- #include <linux/types.h>
diff --git a/testing/net-tools/net-tools-1.60-nameif.patch b/testing/net-tools/net-tools-1.60-nameif.patch
deleted file mode 100644
index 54def00c2..000000000
--- a/testing/net-tools/net-tools-1.60-nameif.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- net-tools-1.60/nameif.c.nameif	2000-10-18 19:26:29.000000000 +0200
-+++ net-tools-1.60/nameif.c	2003-03-19 11:02:01.000000000 +0100
-@@ -117,7 +117,8 @@
- }
- 
- struct change { 
--	struct change *next,**pprev;
-+	struct change *next;
-+	int found;
- 	char ifname[IFNAMSIZ+1];
- 	unsigned char mac[6];
- }; 
-@@ -139,10 +140,7 @@
- 			ch->ifname, pos); 
- 	if (parsemac(p,ch->mac) < 0) 
- 		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
--	if (clist) 
--		clist->pprev = &ch->next;
- 	ch->next = clist;
--	ch->pprev = &clist;
- 	clist = ch;
- 	return 0; 
- }
-@@ -200,7 +198,7 @@
- 
- void usage(void)
- {
--	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
-+	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
- 	exit(1); 
- }
- 
-@@ -277,21 +275,21 @@
- 		ch = lookupmac(mac); 
- 		if (!ch) 
- 			continue;
--			
--		*ch->pprev = ch->next;
-+		
-+		ch->found = 1;	
- 		if (strcmp(p, ch->ifname)) { 
- 			if (setname(p, ch->ifname) < 0)  
- 				complain(_("cannot change name of %s to %s: %s"),
- 						p, ch->ifname, strerror(errno)); 
- 		} 
--		free(ch);
- 	} 
- 	fclose(ifh); 
- 	
- 	while (clist) { 
- 		struct change *ch = clist;
- 		clist = clist->next;
--		warning(_("interface '%s' not found"), ch->ifname); 
-+		if (!ch->found)
-+			warning(_("interface '%s' not found"), ch->ifname); 
- 		free(ch); 
- 	}
- 
diff --git a/testing/net-tools/net-tools-1.60-nameif_strncpy.patch b/testing/net-tools/net-tools-1.60-nameif_strncpy.patch
deleted file mode 100644
index 7568e21a2..000000000
--- a/testing/net-tools/net-tools-1.60-nameif_strncpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- net-tools-1.60/nameif.c.ncpy	2006-10-03 14:24:21.000000000 +0200
-+++ net-tools-1.60/nameif.c	2006-10-03 14:22:43.000000000 +0200
-@@ -100,8 +100,8 @@
- 	struct ifreq ifr;
- 	opensock(); 
- 	memset(&ifr,0,sizeof(struct ifreq));
--	strcpy(ifr.ifr_name, oldname); 
--	strcpy(ifr.ifr_newname, newname); 
-+	strncpy(ifr.ifr_name, oldname, IF_NAMESIZE); 
-+	strncpy(ifr.ifr_newname, newname, IF_NAMESIZE); 
- 	return ioctl(ctl_sk, SIOCSIFNAME, &ifr);
- }
- 
diff --git a/testing/net-tools/net-tools.install b/testing/net-tools/net-tools.install
deleted file mode 100644
index 9eee9e51b..000000000
--- a/testing/net-tools/net-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then
-    echo "hostname and {,yp,nis}domainname has moved:"
-    echo "----------"
-    echo "hostname is now in coreutils"
-    echo "domainname is now in yp-tools"
-    echo "their functionality might have changed slightly"
-    echo ""
-    echo "dnsdomainname remains in net-tools"
-    echo "----------"
-  fi
-}
diff --git a/testing/net-tools/net-tools.patch b/testing/net-tools/net-tools.patch
deleted file mode 100644
index 8af2d2159..000000000
--- a/testing/net-tools/net-tools.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c
---- net-tools-1.60-orig/mii-tool.c	2000-05-21 07:31:17.000000000 -0700
-+++ net-tools-1.60/mii-tool.c	2004-05-31 12:35:21.000000000 -0700
-@@ -379,16 +379,16 @@
- /*--------------------------------------------------------------------*/
- 
- const char *usage =
--"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
--       -V, --version               display version information
--       -v, --verbose               more verbose output
--       -R, --reset                 reset MII to poweron state
--       -r, --restart               restart autonegotiation
--       -w, --watch                 monitor for link status changes
--       -l, --log                   with -w, write events to syslog
--       -A, --advertise=media,...   advertise only specified media
--       -F, --force=media           force specified media technology
--media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
-+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n\
-+       -V, --version               display version information\n\
-+       -v, --verbose               more verbose output\n\
-+       -R, --reset                 reset MII to poweron state\n\
-+       -r, --restart               restart autonegotiation\n\
-+       -w, --watch                 monitor for link status changes\n\
-+       -l, --log                   with -w, write events to syslog\n\
-+       -A, --advertise=media,...   advertise only specified media\n\
-+       -F, --force=media           force specified media technology\n\
-+media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n\
-        (to advertise both HD and FD) 100baseTx, 10baseT\n";
- 
- int main(int argc, char **argv)
diff --git a/testing/ntp/PKGBUILD b/testing/ntp/PKGBUILD
deleted file mode 100644
index 5841142b4..000000000
--- a/testing/ntp/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 140053 2011-10-06 06:09:56Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-
-pkgname=ntp
-pkgver=4.2.6.p4
-_realver=4.2.6p4
-pkgrel=1
-pkgdesc='Network Time Protocol reference implementation'
-url='http://www.ntp.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('openssl' 'readline' 'libcap')
-makedepends=('perl-html-parser')
-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')
-sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf'
-          '97b41b8bc34f259f4e525ab2e58707c9724e72e2'
-          '63572457586379aa6bf75b6e899e71d651e643f4'
-          '6d2d234afb1db2dcb940747a62f70217246a3d13'
-          '6cfcb7bbd34499b30e31dffca2f3e1a036010271')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${_realver}"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-linux-caps \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-$_realver"
-
-	make DESTDIR="${pkgdir}" install
-
-	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
-
-	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
-	cd ..
-
-	rmdir "${pkgdir}"/usr/{lib,sbin}
-	install -d "${pkgdir}/var/lib/ntp"
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/ntp/install b/testing/ntp/install
deleted file mode 100644
index ad9a39d54..000000000
--- a/testing/ntp/install
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-}
diff --git a/testing/ntp/ntp.conf b/testing/ntp/ntp.conf
deleted file mode 100644
index 5f31fea83..000000000
--- a/testing/ntp/ntp.conf
+++ /dev/null
@@ -1,22 +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
-
-# Select three geolocalized NTP public 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 nomodify nopeer
-restrict 127.0.0.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 a3e886e1f..000000000
--- a/testing/ntp/ntpd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-PIDFILE="/var/run/ntpd/ntpd.pid"
-PID=$(cat $PIDFILE 2> /dev/null)
-
-case "$1" in
-  start)
-    stat_busy "Starting NTP Daemon"
-    [ ! -d /var/run/ntpd ] && install -d /var/run/ntpd &>/dev/null
-    if [ -z "$PID" ]; then 
-       /usr/bin/ntpd $NTPD_ARGS -p /var/run/ntpd/ntpd.pid &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon ntpd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NTP Daemon"
-    if [ -n "$PID" ]; then
-      kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        rm $PIDFILE &>/dev/null
-        rm_daemon ntpd
-        stat_done
-      fi
-    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 e728db579..000000000
--- a/testing/ntp/ntpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g"
diff --git a/testing/ntp/ntpdate b/testing/ntp/ntpdate
deleted file mode 100755
index 4f7c8375b..000000000
--- a/testing/ntp/ntpdate
+++ /dev/null
@@ -1,31 +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"
-    /usr/bin/ntpd -q $NTP_CLIENT_OPTION &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      add_daemon ntpdate
-      stat_done
-    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/opal/PKGBUILD b/testing/opal/PKGBUILD
deleted file mode 100644
index 3adf672a4..000000000
--- a/testing/opal/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 142127 2011-11-05 11:37:25Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-pkgname=opal
-pkgver=3.10.2
-pkgrel=3
-pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64)
-url="http://www.ekiga.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex')
-makedepends=('ffmpeg')
-options=(!makeflags)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205')
-
-build() {
-  cd "${srcdir}/opal-${pkgver}"
-  CXXFLAGS="$CXXFLAGS -fpermissive" \
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/opal-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD
deleted file mode 100644
index 6ffc4a7a5..000000000
--- a/testing/opencv/PKGBUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# $Id: PKGBUILD 142159 2011-11-05 11:38:11Z ibiru $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.3.1
-pkgrel=2
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('python2-numpy: Python 2.x interface'
-            'eigen2')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
-md5sums=('827c9f8aa14384c531c73aa165f9b777')
-
-_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() {
-  install=$pkgname.install
-
-  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"
-
-  # prepare FSH-friendly dirs
-  if [ -d OpenCV ]; then
-    mv opencv/samples OpenCV/
-    rm -r opencv
-    mv OpenCV opencv
-  fi
-
-  # separate docs package; also be -R friendly
-  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
-
-  # separate samples package
-  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
-}
-
-package_opencv-docs() {
-  pkgdesc+=" (documentation)"
-  depends=()
-  optdepends=()
-  options=('docs')
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
-}
-
-package_opencv-samples() {
-  pkgdesc+=" (samples)"
-  depends=()
-  optdepends=()
-  options=()
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/opencv/opencv.install b/testing/opencv/opencv.install
deleted file mode 100644
index ae3f50d5c..000000000
--- a/testing/opencv/opencv.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	echo "  Documentation and samples are in separate packages:"
-	echo "    * opencv-docs"
-	echo "    * opencv-samples"
-}
-
-post_upgrade() {
-	post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD
deleted file mode 100644
index 93bc18d02..000000000
--- a/testing/openldap/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 141927 2011-11-03 08:03:29Z eric $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.26
-pkgrel=5
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('libfetch' 'libltdl' 'libsasl')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default ntlm.patch)
-md5sums=('f36f3086031dd56ae94f722ffae8df5e'
-         '40fdbdd6c343019cbadf4eb26c6189f2'
-         '6be69f6b7e522cb64cce8703da81ed32'
-         '4258ddbef923d1f29f2843bc050f8c56')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i "${srcdir}"/ntlm.patch
-  sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
-  sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
-  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
-  sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
-
-  LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" 
-  ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
-    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
-    --enable-ipv6 --enable-syslog --enable-local \
-    --enable-bdb --enable-hdb \
-    --enable-crypt --enable-dynamic \
-    --with-threads  --disable-wrappers \
-    --enable-spasswd --with-cyrus-sasl \
-    --enable-overlays=mod --enable-modules=yes
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make test
-}
-
-package_libldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl' 'libfetch')
-  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')
-  backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
-  options=('!libtool' 'emptydirs')
-  install=openldap.install
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in clients servers doc/man/man{1,5,8} ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  rm -r "${pkgdir}"/run
-
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
-
-  chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-  chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-
-  install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
-  install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
-  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
-  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch
deleted file mode 100644
index 6804b610d..000000000
--- a/testing/openldap/ntlm.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Patch from evolution-exchange (2.10.3).  The ldap_ntlm_bind function is
-actually called by evolution-data-server, checked at version 1.12.2.
-Without this patch, the Exchange addressbook integration uses simple binds
-with cleartext passwords.
-
-Russ checked with openldap-software for upstream's opinion on this patch
-on 2007-12-21.  Upstream had never received it as a patch submission and
-given that it's apparently only for older Exchange servers that can't do
-SASL and DIGEST-MD5, it's not very appealing.
-
-Bug#457374 filed against evolution-data-server asking if this support is
-still required on 2007-12-21.
-
-Index: trunk/include/ldap.h
-===================================================================
---- trunk.orig/include/ldap.h
-+++ trunk/include/ldap.h
-@@ -2461,5 +2461,25 @@
- 	LDAPControl	**ctrls,
- 	LDAPDerefRes	**drp ));
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE  ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+      LDAP    *ld,
-+      LDAP_CONST char *dn,
-+      ber_tag_t tag,
-+      struct berval *cred,
-+      LDAPControl **sctrls,
-+      LDAPControl **cctrls,
-+      int   *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+      LDAP    *ld,
-+      LDAPMessage *res,
-+      struct berval *challenge));
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-Index: trunk/libraries/libldap/ntlm.c
-===================================================================
---- /dev/null
-+++ trunk/libraries/libldap/ntlm.c
-@@ -0,0 +1,138 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP    *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int   *msgidp )
-+{
-+ BerElement  *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+      id, LDAP_REQ_BIND,
-+      ld->ld_version, dn, tag,
-+      cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+   ld->ld_errno = LDAP_ENCODING_ERROR;
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+   return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP    *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement  *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+   return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+   LDAP_FREE( ld->ld_error );
-+   ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+   LDAP_FREE( ld->ld_matched );
-+   ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+      &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+   ld->ld_errno = LDAP_DECODING_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
-+
-Index: trunk/libraries/libldap/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
-@@ -27,7 +27,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- 
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
-Index: trunk/libraries/libldap_r/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
-@@ -29,7 +29,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
- 	thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
-@@ -47,7 +47,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install
deleted file mode 100644
index cf3cb9f25..000000000
--- a/testing/openldap/openldap.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install(){
-  groupadd -g 439 ldap &>/dev/null
-  useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
-  chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_upgrade(){
-  getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
-  getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
-  chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_remove(){
-  if getent passwd ldap >/dev/null 2>&1; then
-    userdel ldap
-  fi
-  if getent group ldap >/dev/null 2>&1; then
-    groupdel ldap
-  fi
-}
diff --git a/testing/openldap/slapd b/testing/openldap/slapd
deleted file mode 100755
index 4f212da66..000000000
--- a/testing/openldap/slapd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
-
-PID=`pidof -o %PPID /usr/sbin/slapd`
-case "$1" in
-  start)
-    stat_busy "Starting OpenLDAP"
-    [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
-    if [ -z "$PID" ]; then
-      if [ -z "$SLAPD_SERVICES" ]; then
-        /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
-      else
-        /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
-      fi
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      add_daemon slapd
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenLDAP"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /run/openldap/slapd.pid
-      rm -f /run/openldap/slapd.args
-      rm_daemon slapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openldap/slapd.default b/testing/openldap/slapd.default
deleted file mode 100644
index 72ae2a6a7..000000000
--- a/testing/openldap/slapd.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# slapd normally serves ldap only on all TCP-ports 389. slapd can also
-# service requests on TCP-port 636 (ldaps) and requests via unix
-# sockets.
-# Example usage:
-#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-SLAPD_OPTIONS=""
diff --git a/testing/patch/PKGBUILD b/testing/patch/PKGBUILD
deleted file mode 100644
index dcef9714f..000000000
--- a/testing/patch/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 141945 2011-11-03 12:04:44Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=patch
-pkgver=2.6.1
-pkgrel=3
-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: Interpret the patch as an ed script; for patch -e functionality(deprecated)')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
-        patch-2.6.1-get-arg.patch)
-md5sums=('d758eb96d3f75047efc004a720d33daf'
-         'f7953f3e472fae5118815e6138372e22'
-         '45cd5709adbbcdcb3ab95dc43559c07c')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Fixed argument type for --get
-  # see https://bugzilla.redhat.com/show_bug.cgi?id=553624
-  patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man 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 8e5089ccd..000000000
--- a/testing/pciutils/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141272 2011-10-27 19:51:53Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pciutils
-pkgver=3.1.8
-pkgrel=1
-pkgdesc="PCI bus configuration space access library and tools"
-arch=(i686 x86_64)
-license=('GPL2')
-groups=('base')
-url="http://mj.ucw.cz/pciutils.html"
-optdepends=('sh: required by update-pciids')
-makedepends=('wget')
-depends=('glibc')
-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=('79312f138311d29291c7d44d624cd37e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./update-pciids.sh
-  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/"
-}
diff --git a/testing/pixman/PKGBUILD b/testing/pixman/PKGBUILD
deleted file mode 100644
index d0e6db20c..000000000
--- a/testing/pixman/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 142246 2011-11-07 09:08:59Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=pixman
-pkgver=0.24.0
-pkgrel=1
-pkgdesc="Pixman library"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org"
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177')
-
-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
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/pkg-config/PKGBUILD b/testing/pkg-config/PKGBUILD
deleted file mode 100644
index a8dd714da..000000000
--- a/testing/pkg-config/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 141947 2011-11-03 12:12:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=pkg-config
-pkgver=0.26
-pkgrel=2
-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=('glibc' 'popt' 'glib2')
-provides=("pkgconfig=${pkgver}")
-conflicts=('pkgconfig')
-replaces=('pkgconfig')
-source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('47525c26a9ba7ba14bf85e01509a7234')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Use system popt
-  ./configure --prefix=/usr --with-installed-popt 
-
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/pkg-config/autoconf-2.66.patch b/testing/pkg-config/autoconf-2.66.patch
deleted file mode 100644
index 14cabdf9f..000000000
--- a/testing/pkg-config/autoconf-2.66.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4
---- pkg-config-0.25-old//pkg.m4	2009-12-07 06:39:02.000000000 +1000
-+++ pkg-config-0.25/pkg.m4	2010-07-15 14:44:37.466942978 +1000
-@@ -135,7 +135,7 @@
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--_PKG_TEXT])dnl
-+_PKG_TEXT])[]dnl
-         ])
- elif test $pkg_failed = untried; then
-      	AC_MSG_RESULT([no])
diff --git a/testing/popt/PKGBUILD b/testing/popt/PKGBUILD
deleted file mode 100644
index fc6688a4f..000000000
--- a/testing/popt/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 142031 2011-11-04 09:28:13Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=popt
-pkgver=1.16
-pkgrel=4
-pkgdesc="A commandline option parser"
-arch=('i686' 'x86_64')
-url="http://rpm5.org"
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3743beefa3dd6247a73f8f7a32c14c33')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # move libs in /lib
-  install -Dm755 "${pkgdir}"/usr/lib/libpopt.so.0.0.0 \
-    ${pkgdir}/lib/libpopt.so.0.0.0
-
-  rm "${pkgdir}"/usr/lib/libpopt.so*
-  ln -sf /lib/libpopt.so "${pkgdir}"/usr/lib/libpopt.so
-  ln -sf libpopt.so.0 "${pkgdir}"/lib/libpopt.so
-  ln -sf libpopt.so.0.0.0 "${pkgdir}"/lib/libpopt.so.0
-
-  # install license
-  install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/procinfo-ng/PKGBUILD b/testing/procinfo-ng/PKGBUILD
deleted file mode 100644
index 5e3808dc5..000000000
--- a/testing/procinfo-ng/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 141905 2011-11-03 00:40:47Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-pkgname=procinfo-ng
-pkgver=2.0.304
-pkgrel=3
-pkgdesc="Displays useful information from /proc"
-arch=('i686' 'x86_64')
-url="http://procinfo-ng.sourceforge.net/"
-license=('GPL2' 'LGPL2.1')
-depends=('ncurses' 'perl')
-provides=('procinfo')
-conflicts=('procinfo')
-replaces=('procinfo')
-source=(http://downloads.sourceforge.net/project/procinfo-ng/procinfo-ng/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        ftp://ftp.archlinux.org/other/procinfo-ng/procinfo-18.tar.gz)
-sha1sums=('da2176a505bcdf65c4eadcf5a2e056fb7a3f84af'
-          '8bc75669cbd27775c3a837209425c5ce76238ebc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # install tools from old procinfo package
-  cd "${srcdir}/procinfo-18"
-  install -m755 lsdev.pl "${pkgdir}/usr/bin/lsdev"
-  install -m755 socklist.pl "${pkgdir}/usr/bin/socklist"
-  install -m644 lsdev.8 "${pkgdir}/usr/share/man/man8/lsdev.8"
-  install -m644 socklist.8 "${pkgdir}/usr/share/man/man8/socklist.8"
-}
diff --git a/testing/pyqt/PKGBUILD b/testing/pyqt/PKGBUILD
deleted file mode 100644
index e5f958ce1..000000000
--- a/testing/pyqt/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 141460 2011-10-30 11:28:17Z andrea $
-# Maintainer:
-# Contributor: 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' 'python2-pyqt')
-pkgver=4.8.6
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
-             'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('9bfd7b08b8e438b83cc50d5c58191f97')
-
-build() {
-  cd "${srcdir}"
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd "${srcdir}/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 "${srcdir}/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(){
-  pkgdesc="A set of Python bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python-qt')
-  provides=('python-qt')
-  
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python2-pyqt(){
-  pkgdesc="PyQt: A set of Python2 bindings for the Qt toolkit"
-  depends=('pyqt' 'python2-sip' 'dbus-python')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python2-qt')
-  provides=('python2-qt')
-
-  cd "${srcdir}/Py2Qt-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
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD
deleted file mode 100644
index 0930f2d7c..000000000
--- a/testing/qt/PKGBUILD
+++ /dev/null
@@ -1,128 +0,0 @@
-# $Id: PKGBUILD 141140 2011-10-24 20:29:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.0rc1
-_pkgver=4.8.0-rc1
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' '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')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-4.8.0"
-source=("http://get.qt.nokia.com/qt/source/${pkgbase}-everywhere-opensource-src-${_pkgver}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop')
-md5sums=('3e003b671384df8d1cb77dd6cc804934'
-         'fc211414130ab2764132e7370f8e5caa'
-         '85179f5e0437514f8639957e1d8baf62'
-         'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd')
-
-build() {
-  cd "${srcdir}"/${_pkgfqn}
-
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
-  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-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 \
-    -examplesdir /usr/share/doc/qt/examples \
-    -demosdir /usr/share/doc/qt/demos \
-    -plugin-sql-{psql,mysql,sqlite,odbc} \
-    -system-sqlite \
-    -no-phonon \
-    -no-phonon-backend \
-    -no-webkit \
-    -no-declarative-debug \
-    -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' 'sqlite3' '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'
-                '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/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/qtwebkit/PKGBUILD b/testing/qtwebkit/PKGBUILD
deleted file mode 100644
index cd1870aae..000000000
--- a/testing/qtwebkit/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 141349 2011-10-29 16:55:30Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=qtwebkit
-pkgver=2.2.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://trac.webkit.org/wiki/QtWebKit'
-pkgdesc='An open source web browser engine (Qt port)'
-license=('LGPL2.1' 'GPL3')
-depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base')
-makedepends=('python2' 'mesa' 'chrpath')
-conflicts=('qt<4.8')
-source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
-        'python2-path.patch')
-sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
-          'b0ef3d5596171e3900a685df9bcfac3068ad6330')
-
-build() {
-  cd "${srcdir}"/QtWebKit-${pkgver}
-
-  patch -p1 -i "${srcdir}"/python2-path.patch
-
-  cd Tools/Scripts
-  ./build-webkit --qt \
-    --prefix=/usr \
-    --makeargs="${MAKEFLAGS}" \
-    --release \
-    --3d-canvas
-}
-
-package() {
-  cd "${srcdir}"/QtWebKit-${pkgver}
-  make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
-  # Fix RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
-}
diff --git a/testing/qtwebkit/python2-path.patch b/testing/qtwebkit/python2-path.patch
deleted file mode 100644
index 2e270e6fc..000000000
--- a/testing/qtwebkit/python2-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~	2011-10-20 22:39:56.044519075 +0000
-+++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro	2011-10-20 22:41:21.302047082 +0000
-@@ -88,5 +88,5 @@
- retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h
- retgen.wkScript = $$PWD/create_regex_tables 
- retgen.input = retgen.wkScript
--retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT}
-+retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT}
- addExtraCompiler(retgen)
---- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~	2011-10-20 22:44:23.827225580 +0000
-+++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri	2011-10-20 22:44:38.550707819 +0000
-@@ -640,7 +640,7 @@
- inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
- inspectorJSON.input = INSPECTOR_JSON
- inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl
--inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
-+inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
- inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl
- inspectorJSON.wkAddOutputToSources = false
- addExtraCompiler(inspectorJSON)
-@@ -723,7 +723,7 @@
- entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp
- entities.input = HTML_ENTITIES
- entities.wkScript = $$PWD/html/parser/create-html-entity-table
--entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
-+entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
- entities.clean = ${QMAKE_FILE_OUT}
- entities.depends = $$PWD/html/parser/create-html-entity-table
- addExtraCompiler(entities)
diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD
deleted file mode 100644
index f1ebbc270..000000000
--- a/testing/readline/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 141949 2011-11-03 12:23:03Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=readline
-_basever=6.2
-_patchlevel=001 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=3
-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')
-
-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 --libdir=/lib
-  make SHLIB_LIBS=-lncurses
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make DESTDIR=${pkgdir} install
-  
-  install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
-
-  # FHS recommends only shared libs in /lib
-  install -dm755 $pkgdir/usr/lib
-  mv $pkgdir/lib/*.a $pkgdir/usr/lib
-
-  # to make the linker find the shared lib and fix compile issues
-  cd ${pkgdir}/usr/lib
-  ln -sv /lib/libreadline.so .
-  ln -sv /lib/libhistory.so .
-}
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/ruby/PKGBUILD b/testing/ruby/PKGBUILD
deleted file mode 100644
index f488dc463..000000000
--- a/testing/ruby/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 141569 2011-10-31 04:52:32Z eric $
-# Maintainer:
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Jeramy Rutley <jrutley@gmail.com>
-
-pkgbase=ruby
-pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p0
-pkgrel=1
-pkgdesc="An object-oriented language for quick and easy programming"
-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/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
-sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \
-      --enable-shared --enable-pthread --disable-rpath
-  make
-}
-
-package_ruby() {
-  depends=('openssl' 'libffi' 'libyaml')
-  provides=('rubygems' 'rake')
-  conflicts=('rake')
-  optdepends=('tk: for Ruby/TK')
-
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make DESTDIR="${pkgdir}" install-nodoc
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
-}
-
-package_ruby-docs() {
-  pkgdesc="Documentation files for ruby"
-
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make DESTDIR="${pkgdir}" install-doc install-capi
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
-}
diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD
deleted file mode 100644
index 996661740..000000000
--- a/testing/run-parts/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 142524 2011-11-11 14:47:40Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=run-parts
-pkgver=4.0.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/run-parts/debianutils_${pkgver}.tar.gz")
-sha256sums=('9a14722c7422c6d16f30c80b74201d9c803beeef2bb4c004964d0979eaa1232f')
-
-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/sed/PKGBUILD b/testing/sed/PKGBUILD
deleted file mode 100644
index 1fb61309d..000000000
--- a/testing/sed/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 141951 2011-11-03 13:36:47Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=sed
-pkgver=4.2.1
-pkgrel=4
-pkgdesc="GNU stream editor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/sed"
-license=('GPL3')
-groups=('base')
-depends=('acl' 'sh')
-makedepends=('gettext')
-install=sed.install
-source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('f0fd4d7da574d4707e442285fd2d3b86'
-         '91871b227dbf0916e019ba1fb0fbfdf3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --bindir=/bin --without-included-regex
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/sed/sed.install b/testing/sed/sed.install
deleted file mode 100644
index c0524038b..000000000
--- a/testing/sed/sed.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(sed.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/sox/PKGBUILD b/testing/sox/PKGBUILD
deleted file mode 100644
index ebe832d53..000000000
--- a/testing/sox/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 142161 2011-11-05 11:38:13Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sox
-pkgver=14.3.2
-pkgrel=4
-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')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
-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-14.3.2-ffmpeg.patch)
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
-          '86caa6aa86a0bf7a048522114d4efd11acbbda70')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
-  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-dyn-default --with-distro="Arch Linux"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/sox/sox-14.3.2-ffmpeg.patch b/testing/sox/sox-14.3.2-ffmpeg.patch
deleted file mode 100644
index 5289b9b47..000000000
--- a/testing/sox/sox-14.3.2-ffmpeg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: sox-14.3.2/src/ffmpeg.c
-===================================================================
---- sox-14.3.2.orig/src/ffmpeg.c
-+++ sox-14.3.2/src/ffmpeg.c
-@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
- 
-   if (!codec || avcodec_open(enc, codec) < 0)
-     return -1;
--  if (enc->codec_type != CODEC_TYPE_AUDIO) {
-+  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
-     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
-     return -1;
-   }
-@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
-   /* Find audio stream (FIXME: allow different stream to be selected) */
-   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
-     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
--    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-+    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-       ffmpeg->audio_index = i;
-       break;
-     }
-@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
- 
-   c = st->codec;
-   c->codec_id = codec_id;
--  c->codec_type = CODEC_TYPE_AUDIO;
-+  c->codec_type = AVMEDIA_TYPE_AUDIO;
- 
-   /* put sample parameters */
-   c->bit_rate = 256000;  /* FIXME: allow specification */
-@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
-       av_init_packet(&pkt);
-       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
-       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       pkt.stream_index = ffmpeg->audio_st->index;
-       pkt.data = ffmpeg->audio_buf_aligned;
- 
diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD
deleted file mode 100644
index 710251b90..000000000
--- a/testing/sqlite3/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 141735 2011-11-02 16:36:18Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3070900
-_amalgamationver2=${_amalgamationver/00/}
-_docver=${_amalgamationver}	#3070700
-pkgver=${_amalgamationver2//0/.}
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline>=6.0.00')
-source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
-	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
-	#http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
-	http://www.sqlite.org/sqlite-doc-${_docver}.zip
-	license.txt)
-options=('!libtool' '!emptydirs')
-md5sums=('dce303524736fe89a76b8ed29d566352'
-         'c48c231dd43d3b74f1d00c36424d87f4'
-         'c1cdbc5544034d9012e421e75a5e4890')
-
-build() {
-  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-
-  # build sqlite
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
-  ./configure --prefix=/usr \
-	--disable-static
-  make
-  
-  # build the tcl extension    
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
-  ./configure --prefix=/usr \
-	--with-system-sqlite
-  make
-
-}
-
-package_sqlite3() {
- 
- pkgdesc="A C library that implements an SQL database engine"
- depends=('readline>=6.0.00')
- conflicts=('sqlite')
- replaces=('sqlite')
- 
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
-  make DESTDIR=${pkgdir} install
-  
-  # license
-  install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_sqlite3-tcl() {
- 
- pkgdesc="sqlite3 Tcl Extension Architecture (TEA)"
- depends=('sqlite3>=3.7.5')
-
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
-  make DESTDIR=${pkgdir} install
-}
-
-package_sqlite3-doc() {
- pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
- #arch=('any') - not yet supported
-
-  #cd ${srcdir}/sqlite-doc-${_amalgamationver}
-  cd ${srcdir}/sqlite-doc-${_docver}
-  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
-  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
-  
-  # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605
-  find ${pkgdir} -type f -perm 755 -exec ls -lha {} \;
-  find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \;
-
-  find ${pkgdir} -type f -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -type d -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -name '*~' -exec rm -f {} \;
-
-  find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite3-doc/usr/share/doc/sqlite3/images/fileformat/.~lock.indexpage.odg#
-  find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \;
-  find ${pkgdir} -name '.~*' -exec rm -f {} \;
-}
diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt
deleted file mode 100644
index 118c5d5e6..000000000
--- a/testing/sqlite3/license.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-SQLite Copyright
-SQLite is in the
-Public Domain 
-
-
-All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. 
-
-The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. 
-
-All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. 
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: 
-You are using SQLite in a jurisdiction that does not recognize the public domain. 
-You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. 
-You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. 
-Your legal department tells you that you have to purchase a license. 
-
-If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. 
-Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: 
-The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. 
-
-We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA 
-
-A template copyright release is available in PDF or HTML. You can use this release to make future changes.
-
-see http://www.sqlite.org/copyright.html
-\ No newline at end of file
diff --git a/testing/sysfsutils/PKGBUILD b/testing/sysfsutils/PKGBUILD
deleted file mode 100644
index fd238c0c4..000000000
--- a/testing/sysfsutils/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 141986 2011-11-03 20:17:26Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=sysfsutils
-pkgver=2.1.0
-pkgrel=7
-pkgdesc="System Utilities Based on Sysfs"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-url="http://linux-diag.sourceforge.net/Sysfsutils.html"
-groups=('base')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/linux-diag/${pkgname}-${pkgver}.tar.gz)
-md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc')
-options=(!libtool)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}" 
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-  mkdir -v lib
-  mv -v usr/lib/libsysfs.so.2* lib/
-  ln -svf ../../lib/libsysfs.so.2 usr/lib/libsysfs.so
-}
diff --git a/testing/tar/PKGBUILD b/testing/tar/PKGBUILD
deleted file mode 100644
index 4ebcbd5fd..000000000
--- a/testing/tar/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 141953 2011-11-03 14:13:05Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=tar
-pkgver=1.26
-pkgrel=2
-pkgdesc="Utility used to store, backup, and transport files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/tar/tar.html"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'sh')
-options=('!emptydirs')
-install=tar.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-        tar.1)
-md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1'
-         '6618d5fe7785e138c27d7d6a24e998b2'
-         'e97e7343f4e23724b4c48bca2f033e38')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin
-  make
-}
-
-check() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make check
-}
-  
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-  install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1
-}
diff --git a/testing/tar/tar.1 b/testing/tar/tar.1
deleted file mode 100644
index 75bbcd38c..000000000
--- a/testing/tar/tar.1
+++ /dev/null
@@ -1,367 +0,0 @@
-.\" generated by script on Fri Aug 19 16:19:30 2011
-.Dd Aug 19, 2011
-.Dt TAR 1
-.Sh NAME
-.Nm tar
-.Nd The GNU version of the tar archiving utility
-.Sh SYNOPSIS
-.Nm tar
-.Oo Fl Oc Cm A Fl \-catenate \-concatenate Cm \||\| c Fl \-create Cm \||\| d Fl \-diff \-compare Cm \||\| Fl \-delete Cm \||\| r Fl \-append Cm \||\| t Fl \-list Cm \||\| Fl \-test\-label Cm \||\| u Fl \-update Cm \||\| x Fl \-extract \-get
-.Op Ar options
-.Op Ar pathname ...
-.Sh DESCRIPTION
-.Nm Tar
-stores and extracts files from a tape or disk archive.
-.Pp
-The first argument to
-tar
-should be a function; either one of the letters
-.Cm Acdrtux ,
-or one of the long function names.
-A function letter need not be prefixed with ``\-'', and may be combined
-with other single-letter options.
-A long function name must be prefixed with
-.Cm \\-\\- .
-Some options take a parameter; with the single-letter form
-these must be given as separate arguments.
-With the long form, they may be given by appending
-.Cm = Ns Ar value
-to the option.
-.Sh FUNCTION LETTERS
-Main operation mode:
-.Bl -tag -width flag
-.It Fl A , Fl \-catenate , Fl \-concatenate
-append tar files to an archive
-.It Fl c , Fl \-create
-create a new archive
-.It Fl d , Fl \-diff , Fl \-compare
-find differences between archive and file system
-.It Fl \-delete
-delete from the archive (not on mag tapes!)
-.It Fl r , Fl \-append
-append files to the end of an archive
-.It Fl t , Fl \-list
-list the contents of an archive
-.It Fl \-test\-label
-test the archive volume label and exit
-.It Fl u , Fl \-update
-only append files newer than copy in archive
-.It Fl x , Fl \-extract , Fl \-get
-extract files from an archive
-.El
-.Sh OTHER OPTIONS
-Operation modifiers:
-.Bl -tag -width flag
-.It \-[0\-7][lmh]
-specify drive and density
-.It Fl a , Fl \-auto\-compress
-use archive suffix to determine the compression program
-.It Fl \-add\-file Ns \= Ns Ar FILE
-add given FILE to the archive (useful if its name starts with a dash)
-.It Fl \-anchored
-patterns match file name start
-.It Fl \-no\-anchored
-patterns match after any `/' (default for exclusion)
-.It Fl \-atime\-preserve
-preserve access times on dumped files, either by restoring the times
-.It Fl \-no\-auto\-compress
-do not use archive suffix to determine the compression program
-.It Fl b , Fl \-blocking\-factor Ar BLOCKS
-BLOCKS x 512 bytes per record
-.It Fl B , Fl \-read\-full\-records
-reblock as we read (for 4.2BSD pipes)
-.It Fl \-backup
-backup before removal, choose version CONTROL
-.It Fl C , Fl \-directory Ar DIR
-change to directory DIR
-.It Fl \-check\-device
-check device numbers when creating incremental archives (default)
-.It Fl \-no\-check\-device
-do not check device numbers when creating incremental archives
-.It Fl \-checkpoint
-display progress messages every NUMBERth record (default 10)
-.It Fl \-checkpoint\-action Ns \= Ns Ar ACTION
-execute ACTION on each checkpoint
-.It Fl \-delay\-directory\-restore
-delay setting modification times and permissions of extracted
-.It Fl \-no\-delay\-directory\-restore
-cancel the effect of --delay-directory-restore option
-.It Fl \-exclude Ns \= Ns Ar PATTERN
-exclude files, given as a PATTERN
-.It Fl \-exclude\-backups
-exclude backup and lock files
-.It Fl \-exclude\-caches
-exclude contents of directories containing CACHEDIR.TAG, 
-.It Fl \-exclude\-caches\-all
-exclude directories containing CACHEDIR.TAG
-.It Fl \-exclude\-caches\-under
-exclude everything under directories containing CACHEDIR.TAG
-.It Fl \-exclude\-tag Ns \= Ns Ar FILE
-exclude contents of directories containing FILE, except
-.It Fl \-exclude\-tag\-all Ns \= Ns Ar FILE
-exclude directories containing FILE
-.It Fl \-exclude\-tag\-under Ns \= Ns Ar FILE
-exclude everything under directories containing FILE
-.It Fl \-exclude\-vcs
-exclude version control system directories
-.It Fl f , Fl \-file Ar ARCHIVE
-use archive file or device ARCHIVE
-.It Fl F , Fl \-info\-script , Fl \-new\-volume\-script Ar NAME
-run script at end of each tape (implies -M)
-.It Fl \-force\-local
-archive file is local even if it has a colon
-.It Fl \-full\-time
-print file time to its full resolution
-.It Fl g , Fl \-listed\-incremental Ar FILE
-handle new GNU-format incremental backup
-.It Fl G , Fl \-incremental
-handle old GNU-format incremental backup
-.It Fl \-group Ns \= Ns Ar NAME
-force NAME as group for added files
-.It Fl h , Fl \-dereference
-follow symlinks; archive and dump the files they point to
-.It Fl H , Fl \-format Ar FORMAT
-create archive of the given formatFORMAT is one of the following:
-.Bl -tag -width flag
-.It Fl \-format=gnu
-GNU tar 1.13.x format
-.It Fl \-format=oldgnu
-GNU format as per tar <= 1.12
-.It Fl \-format=pax
-POSIX 1003.1-2001 (pax) format
-.It Fl \-format=posix
-same as pax
-.It Fl \-format=ustar
-POSIX 1003.1-1988 (ustar) format
-.It Fl \-format=v7
-old V7 tar format
-.El
-.It Fl \-hard\-dereference
-follow hard links; archive and dump the files they refer to
-.It Fl i , Fl \-ignore\-zeros
-ignore zeroed blocks in archive (means EOF)
-.It Fl I , Fl \-use\-compress\-program Ar PROG
-filter through PROG (must accept -d)
-.It Fl \-ignore\-case
-ignore case
-.It Fl \-no\-ignore\-case
-case sensitive matching (default)
-.It Fl \-ignore\-command\-error
-ignore exit codes of children
-.It Fl \-no\-ignore\-command\-error
-treat non-zero exit codes of children as error
-.It Fl \-ignore\-failed\-read
-do not exit with nonzero on unreadable files
-.It Fl \-index\-file Ns \= Ns Ar FILE
-send verbose output to FILE
-.It Fl j , Fl \-bzip2
-
-.It Fl J , Fl \-xz
-
-.It Fl k , Fl \-keep\-old\-files
-don't replace existing files when extracting
-.It Fl K , Fl \-starting\-file Ar MEMBER-NAME
-begin at member MEMBER-NAME in the archive
-.It Fl \-keep\-newer\-files
-don't replace existing files that are newer than their archive copies
-.It Fl l , Fl \-check\-links
-print a message if not all links are dumped
-.It Fl L , Fl \-tape\-length Ar NUMBER
-change tape after writing NUMBER x 1024 bytes
-.It Fl \-level Ns \= Ns Ar NUMBER
-dump level for created listed-incremental archive
-.It Fl \-lzip
-
-.It Fl \-lzma
-
-.It Fl \-lzop
-
-.It Fl m , Fl \-touch
-don't extract file modified time
-.It Fl M , Fl \-multi\-volume
-create/list/extract multi-volume archive
-.It Fl \-mode Ns \= Ns Ar CHANGES
-force (symbolic) mode CHANGES for added files
-.It Fl \-mtime Ns \= Ns Ar DATE-OR-FILE
-set mtime for added files from DATE-OR-FILE
-.It Fl n , Fl \-seek
-archive is seekable
-.It Fl N , Fl \-newer , Fl \-after\-date Ar DATE-OR-FILE
-only store files newer than DATE-OR-FILE
-.It Fl \-newer\-mtime Ns \= Ns Ar DATE
-compare date and time when data changed only
-.It Fl \-null
--T reads null-terminated names, disable -C
-.It Fl \-no\-null
-disable the effect of the previous --null option
-.It Fl \-numeric\-owner
-always use numbers for user/group names
-.It Fl O , Fl \-to\-stdout
-extract files to standard output
-.It Fl \-occurrence
-process only the NUMBERth occurrence of each file in the archive;
-.It Fl \-old\-archive , Fl \-portability
-same as --format=v7
-.It Fl \-one\-file\-system
-stay in local file system when creating archive
-.It Fl \-overwrite
-overwrite existing files when extracting
-.It Fl \-overwrite\-dir
-overwrite metadata of existing directories when extracting (default)
-.It Fl \-no\-overwrite\-dir
-preserve metadata of existing directories
-.It Fl \-owner Ns \= Ns Ar NAME
-force NAME as owner for added files
-.It Fl p , Fl \-preserve\-permissions , Fl \-same\-permissions
-extract information about file permissions (default for superuser)
-.It Fl P , Fl \-absolute\-names
-don't strip leading `/'s from file names
-.It Fl \-pax\-option Ns \= Ns Ar keyword[[:]=value][,keyword[[:]=value]]...
-control pax keywords
-.It Fl \-posix
-same as --format=posix
-.It Fl \-preserve
-same as both -p and -s
-.It Fl \-quote\-chars Ns \= Ns Ar STRING
-additionally quote characters from STRING
-.It Fl \-no\-quote\-chars Ns \= Ns Ar STRING
-disable quoting for characters from STRING
-.It Fl \-quoting\-style Ns \= Ns Ar STYLE
-set name quoting style; see below for valid STYLE values
-.It Fl R , Fl \-block\-number
-show block number within archive with each message
-.It Fl \-record\-size Ns \= Ns Ar NUMBER
-NUMBER of bytes per record, multiple of 512
-.It Fl \-recursion
-recurse into directories (default)
-.It Fl \-no\-recursion
-avoid descending automatically in directories
-.It Fl \-recursive\-unlink
-empty hierarchies prior to extracting directory
-.It Fl \-remove\-files
-remove files after adding them to the archive
-.It Fl \-restrict
-disable use of some potentially harmful options
-.It Fl \-rmt\-command Ns \= Ns Ar COMMAND
-use given rmt COMMAND instead of rmt
-.It Fl \-rsh\-command Ns \= Ns Ar COMMAND
-use remote COMMAND instead of rsh
-.It Fl s , Fl \-preserve\-order , Fl \-same\-order
-sort names to extract to match archive
-.It Fl S , Fl \-sparse
-handle sparse files efficiently
-.It Fl \-same\-owner
-try extracting files with the same ownership as exists in the archive (default for superuser)
-.It Fl \-no\-same\-owner
-extract files as yourself (default for ordinary users)
-.It Fl \-no\-same\-permissions
-apply the user's umask when extracting permissions from the archive (default for ordinary users)
-.It Fl \-no\-seek
-archive is not seekable
-.It Fl \-show\-defaults
-show tar defaults
-.It Fl \-show\-omitted\-dirs
-when listing or extracting, list each directory that does not match search criteria
-.It Fl \-show\-transformed\-names , Fl \-show\-stored\-names
-show file or archive names after transformation
-.It Fl \-sparse\-version Ns \= Ns Ar MAJOR[.MINOR]
-set version of the sparse format to use (implies --sparse)
-.It Fl \-strip\-components Ns \= Ns Ar NUMBER
-strip NUMBER leading components from file names on extraction
-.It Fl \-suffix Ns \= Ns Ar STRING
-backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)
-.It Fl T , Fl \-files\-from Ar FILE
-get names to extract or create from FILE
-.It Fl \-to\-command Ns \= Ns Ar COMMAND
-pipe extracted files to another program
-.It Fl \-totals
-print total bytes after processing the archive; 
-.It Fl \-transform , Fl \-xform Ar EXPRESSION
-use sed replace EXPRESSION to transform file names
-.It Fl U , Fl \-unlink\-first
-remove each file prior to extracting over it
-.It Fl \-unquote
-unquote filenames read with -T (default)
-.It Fl \-no\-unquote
-do not unquote filenames read with -T
-.It Fl \-utc
-print file modification times in UTC
-.It Fl v , Fl \-verbose
-verbosely list files processed
-.It Fl V , Fl \-label Ar TEXT
-create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name
-.It Fl \-volno\-file Ns \= Ns Ar FILE
-use/update the volume number in FILE
-.It Fl w , Fl \-interactive , Fl \-confirmation
-ask for confirmation for every action
-.It Fl W , Fl \-verify
-attempt to verify the archive after writing it
-.It Fl \-warning Ns \= Ns Ar KEYWORD
-warning control
-.It Fl \-wildcards
-use wildcards (default for exclusion)
-.It Fl \-wildcards\-match\-slash
-wildcards match `/' (default for exclusion)
-.It Fl \-no\-wildcards\-match\-slash
-wildcards do not match `/'
-.It Fl \-no\-wildcards
-verbatim string matching
-.It Fl X , Fl \-exclude\-from Ar FILE
-exclude patterns listed in FILE
-.It Fl z , Fl \-gzip , Fl \-gunzip Fl \-ungzip
-
-.It Fl Z , Fl \-compress , Fl \-uncompress
-
-.El
-.Sh ENVIRONMENT
-The behavior of tar is controlled by the following environment variables,
-among others:
-.Bl -tag -width Ds
-.It Ev SIMPLE_BACKUP_SUFFIX
-Backup prefix to use when extracting, if
-.Fl \-suffix
-is not specified.
-The backup suffix defaults to `~' if neither is specified.
-.It Ev TAR_OPTIONS
-Options to prepend to those specified on the command line, separated by
-whitespace.  Embedded backslashes may be used to escape whitespace or
-backslashes within an option.
-.It Ev TAPE
-Device or file to use for the archive if 
-.Fl \-file
-is not specified.
-If this environment variable is unset, use stdin or stdout instead.
-.It Ev TAR_LONGLINK_100
-.El
-.Sh EXAMPLES
-Create archive.tar from files foo and bar.
-.Bd -literal -offset indent -compact
-tar \-cf archive.tar foo bar
-.Ed
-List all files in archive.tar verbosely.
-.Bd -literal -offset indent -compact
-tar \-tvf archive.tar
-.Ed
-Extract all files from archive.tar.
-.Bd -literal -offset indent -compact
-tar \-xf archive.tar
-.Ed
-.Sh SEE ALSO
-.\" libarchive
-.Xr tar 5 ,
-.\" man-pages
-.Xr symlink 7 ,
-.Xr rmt 8
-.Sh HISTORY
-The
-.Nm tar
-command appeared in
-.At v7 .
-.Sh BUGS
-The GNU folks, in general, abhor man pages, and create info documents instead.
-Unfortunately, the info document describing tar is licensed under the GFDL with
-invariant cover texts, which makes it impossible to include any text
-from that document in this man page.
-Most of the text in this document was automatically extracted from the usage
-text in the source.
-It may not completely describe all features of the program.
diff --git a/testing/tar/tar.install b/testing/tar/tar.install
deleted file mode 100644
index 8de1f9766..000000000
--- a/testing/tar/tar.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(tar.info tar.info-1 tar.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/tcl/PKGBUILD b/testing/tcl/PKGBUILD
deleted file mode 100644
index 617228baf..000000000
--- a/testing/tcl/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 142445 2011-11-09 23:58:47Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=tcl
-pkgver=8.5.11
-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=('b01a9691c83990b3db0ce62d1012ca67')
-
-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-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD
deleted file mode 100644
index 669ab698f..000000000
--- a/testing/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 142288 2011-11-07 21:16:38Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.14.0
-pkgrel=1
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
-install=telepathy-gabble.install
-md5sums=('73afa5533833d176b9b82b96351efe63')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/testing/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD
deleted file mode 100644
index ddc67d884..000000000
--- a/testing/telepathy-mission-control/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 142283 2011-11-07 20:46:50Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Ju Liu <liuju86 at gmail dot com>
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Contributor: Andreas Zwinkau <beza1e1@web.de>
-pkgname=telepathy-mission-control
-pkgver=5.10.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')
-makedepends=('libxslt' 'python2')
-install=telepathy-mission-control.install
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz)
-md5sums=('d69e52faf92bab51f3e49ddf7593f3c0')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy \
-	--enable-gnome-keyring
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/telepathy-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/texinfo/PKGBUILD b/testing/texinfo/PKGBUILD
deleted file mode 100644
index b5120227e..000000000
--- a/testing/texinfo/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 141955 2011-11-03 14:24:19Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=texinfo
-pkgver=4.13a
-pkgrel=6
-pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/texinfo/"
-license=('GPL3')
-groups=('base')
-depends=('ncurses' 'findutils' 'gzip')
-install=texinfo.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('71ba711519209b5fb583fed2b3d86fcb'
-         'db2ca82c831684cd7cef181234017c46')
-
-build() {
-  cd ${srcdir}/${pkgname}-4.13
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-4.13
-  make DESTDIR=${pkgdir} install
-
-  # fix this here as it prevents make from trying to rebuild manual pages
-  sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi
-}
diff --git a/testing/texinfo/texinfo.install b/testing/texinfo/texinfo.install
deleted file mode 100644
index f1554e4f4..000000000
--- a/testing/texinfo/texinfo.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3)
-
-post_install() {
-  # Scan *all* info files on install
-  for file in $(find $infodir -type f ! -name dir); do
-      install-info $file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/tk/PKGBUILD b/testing/tk/PKGBUILD
deleted file mode 100644
index 091bd8f72..000000000
--- a/testing/tk/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 142447 2011-11-10 00:01:05Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=tk
-pkgver=8.5.11
-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=('b61b72f0aad230091b100746f078b8f1')
-
-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/transcode/PKGBUILD b/testing/transcode/PKGBUILD
deleted file mode 100644
index e0ef88386..000000000
--- a/testing/transcode/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 142163 2011-11-05 11:38:15Z ibiru $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.5
-pkgrel=7
-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' '!makeflags')
-source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-	transcode-1.1.5-jpeg-7.patch  transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch)
-sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977'
-          '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2'
-          '2d3bb4486394ee55540e772f134e193874e5c2b4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 < ../transcode-1.1.5-jpeg-7.patch
-  patch -p1 < ../transcode-1.1.5-mpa.patch
-  patch -p1 < ../transcode-1.1.5-ffmpeg.patch
-
- # building from here
-  ./configure --prefix=/usr \
-    --enable-sse=no --enable-sse2=no --enable-altivec=no --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 \
-    --with-libxml2-prefix=/usr \
-    --with-mjpegtools-prefix=/usr \
-    --with-imagemagick-prefix=/usr \
-    --with-libdv-includes=/usr \
-    --with-libpostproc-includes=/usr/include/libpostproc \
-    --with-ogg-prefix=/usr \
-    --with-lame-libs=/usr \
-    --with-lzo-libs=/usr/lib \
-    --with-libavcodec-prefix=/usr \
-    --with-libavcodec-includes=/usr/include \
-    --with-libavcodec-libs=/usr/lib
-
-  make
- ##############################################################################
- # this imports the latest subtitleripper sources and replaces the internal
-  mkdir contrib
-  mv "${srcdir}/subtitleripper" contrib/subrip
- # removes dependency on libppm, make it dependend on netpbm just failed, argh...
-  cd contrib/subrip
-  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 contrib/subrip
-  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/transcode-1.1.5-ffmpeg.patch b/testing/transcode/transcode-1.1.5-ffmpeg.patch
deleted file mode 100644
index 86e8272e9..000000000
--- a/testing/transcode/transcode-1.1.5-ffmpeg.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: transcode-1.1.5/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.5.orig/encode/encode_lavc.c
-+++ transcode-1.1.5/encode/encode_lavc.c
-@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa
-     /* 
-      * context *transcode* (not libavcodec) defaults
-      */
--    pd->ff_vcontext.mb_qmin                 = 2;
--    pd->ff_vcontext.mb_qmax                 = 31;
-     pd->ff_vcontext.max_qdiff               = 3;
-     pd->ff_vcontext.max_b_frames            = 0;
-     pd->ff_vcontext.me_range                = 0;
-@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri
-         //  handled by transcode core
-         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-         //  handled by transcode core
--        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
--        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
-Index: transcode-1.1.5/export/aud_aux.c
-===================================================================
---- transcode-1.1.5.orig/export/aud_aux.c
-+++ transcode-1.1.5/export/aud_aux.c
-@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
-     memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
--    mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
-+    mpa_ctx.codec_type  = AVMEDIA_TYPE_AUDIO;
-     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
-     mpa_ctx.channels    = vob->dm_chan;            // channels
-     mpa_ctx.sample_rate = vob->a_rate;
-Index: transcode-1.1.5/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.5.orig/export/export_ffmpeg.c
-+++ transcode-1.1.5/export/export_ffmpeg.c
-@@ -643,8 +643,6 @@ MOD_init
- 
-     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
-     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
--    lavc_venc_context->mb_qmin            = lavc_param_mb_qmin;
--    lavc_venc_context->mb_qmax            = lavc_param_mb_qmax;
-     lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
-     lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
-     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
-Index: transcode-1.1.5/import/decode_lavc.c
-===================================================================
---- transcode-1.1.5.orig/import/decode_lavc.c
-+++ transcode-1.1.5/import/decode_lavc.c
-@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode)
- 
-       //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read);
-       do {
--	  len = avcodec_decode_video(lavc_dec_context, &picture,
--		  &got_picture, buffer+buf_len, mp4_size-buf_len);
-+          AVPacket pkt;
-+	  av_init_packet( &pkt );
-+	  pkt.data = buffer+buf_len;
-+	  pkt.size = mp4_size-buf_len;
-+	  len = avcodec_decode_video2(lavc_dec_context, &picture,
-+		  &got_picture, &pkt);
- 
- 	  if (len < 0) {
- 	      tc_log_error(__FILE__, "frame decoding failed");
-Index: transcode-1.1.5/import/probe_ffmpeg.c
-===================================================================
---- transcode-1.1.5.orig/import/probe_ffmpeg.c
-+++ transcode-1.1.5/import/probe_ffmpeg.c
-@@ -47,7 +47,7 @@ static void translate_info(const AVForma
-     for (i = 0; i < ctx->nb_streams; i++) {
-         st = ctx->streams[i];
- 
--        if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
-+        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-             info->bitrate = st->codec->bit_rate / 1000;
-             info->width = st->codec->width;
-             info->height = st->codec->height;
-@@ -65,7 +65,7 @@ static void translate_info(const AVForma
-     for (i = 0; i < ctx->nb_streams; i++) {
-         st = ctx->streams[i];
- 
--        if (st->codec->codec_type == CODEC_TYPE_AUDIO
-+        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO
-          && j < TC_MAX_AUD_TRACKS) {
-             info->track[j].format = 0x1; /* known wrong */
-             info->track[j].chan = st->codec->channels;
-Index: transcode-1.1.5/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.5.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.5/export/ffmpeg_cfg.c
-@@ -34,8 +34,6 @@ int lavc_param_vme = 4;
- //int lavc_param_vqscale = 0;
- //int lavc_param_vqmin = 2;
- //int lavc_param_vqmax = 31;
--int lavc_param_mb_qmin = 2;
--int lavc_param_mb_qmax = 31;
- int lavc_param_lmin = 2;
- int lavc_param_lmax = 31;
- int lavc_param_vqdiff = 3;
-@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={
- //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
--    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
--    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
-     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
-     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-Index: transcode-1.1.5/export/ffmpeg_cfg.h
-===================================================================
---- transcode-1.1.5.orig/export/ffmpeg_cfg.h
-+++ transcode-1.1.5/export/ffmpeg_cfg.h
-@@ -13,8 +13,6 @@ extern int lavc_param_vme;
- //extern int lavc_param_vqscale;
- //extern int lavc_param_vqmin;
- //extern int lavc_param_vqmax;
--extern int lavc_param_mb_qmin;
--extern int lavc_param_mb_qmax;
- extern int lavc_param_lmin;
- extern int lavc_param_lmax;
- extern int lavc_param_vqdiff;
diff --git a/testing/transcode/transcode-1.1.5-jpeg-7.patch b/testing/transcode/transcode-1.1.5-jpeg-7.patch
deleted file mode 100644
index 288932a61..000000000
--- a/testing/transcode/transcode-1.1.5-jpeg-7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=294488
-
-Patch by: Salah Coronya
-
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
---- export/export_jpg.c
-+++ export/export_jpg.c
-@@ -91,6 +91,7 @@
- 
-   jpeg_set_quality(&encinfo, quality, TRUE);
-   encinfo.raw_data_in = TRUE;
-+  encinfo.do_fancy_downsampling = FALSE;
-   encinfo.in_color_space = JCS_YCbCr;
- 
-   encinfo.comp_info[0].h_samp_factor = 2;
diff --git a/testing/transcode/transcode-1.1.5-mpa.patch b/testing/transcode/transcode-1.1.5-mpa.patch
deleted file mode 100644
index e7fb0fc1c..000000000
--- a/testing/transcode/transcode-1.1.5-mpa.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- transcode-1.1.5-old/export/aud_aux.c	2010-07-04 12:44:31.867550180 -0500
-+++ transcode-1.1.5/export/aud_aux.c	2010-07-04 13:41:01.253292529 -0500
-@@ -347,6 +347,7 @@
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
-     memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
-+    mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
-     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
-     mpa_ctx.channels    = vob->dm_chan;            // channels
-     mpa_ctx.sample_rate = vob->a_rate;
diff --git a/testing/tzdata/Makefile.patch b/testing/tzdata/Makefile.patch
deleted file mode 100644
index e88f9d907..000000000
--- a/testing/tzdata/Makefile.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -Naur src/Makefile src-p/Makefile
---- src/Makefile	2007-08-20 16:47:41.000000000 +0200
-+++ src-p/Makefile	2007-10-02 04:07:44.000000000 +0200
-@@ -34,17 +34,17 @@
- 
- # Everything gets put in subdirectories of. . .
- 
--TOPDIR=		/usr/local
-+TOPDIR=		$(DESTDIR)/usr
- 
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
- 
--TZDIR=		$(TOPDIR)/etc/zoneinfo
-+TZDIR=		$(TOPDIR)/share/zoneinfo
- 
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
- 
--ETCDIR=		$(TOPDIR)/etc
-+SBINDIR=		$(TOPDIR)/sbin
- 
- # If you "make INSTALL", the "date" command gets installed in. . .
- 
-@@ -52,7 +52,7 @@
- 
- # Manual pages go in subdirectories of. . .
- 
--MANDIR=		$(TOPDIR)/man
-+MANDIR=		$(TOPDIR)/share/man
- 
- # Library functions are put in an archive in LIBDIR.
- 
-@@ -83,7 +83,7 @@
- 
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=
-+LDLIBS=$(LDFLAGS)
- 
- # Add the following to the end of the "CFLAGS=" line as needed.
- #  -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
-@@ -211,7 +211,7 @@
- # before the first Monday in January when a "%V" format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
- 
--CFLAGS=
-+CFLAGS += -std=gnu99
- 
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS=	-s
-@@ -220,7 +220,7 @@
- ZIC=		$(zic) $(ZFLAGS)
- 
- # The name of a Posix-compliant `awk' on your system.
--AWK=		nawk
-+AWK=		awk
- 
- # The path where SGML DTDs are kept.
- SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
-@@ -241,8 +241,10 @@
- 
- ###############################################################################
- 
--cc=		cc
--CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+=		-DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
- 
- TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -282,14 +284,16 @@
- 
- ALL:		all date
- 
--install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
- 		$(ZIC) -y $(YEARISTYPE) \
- 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- 		cp iso3166.tab zone.tab $(TZDIR)/.
--		-mkdir $(TOPDIR) $(ETCDIR)
--		cp tzselect zic zdump $(ETCDIR)/.
--		-mkdir $(TOPDIR) $(MANDIR) \
-+		-mkdir -p $(TOPDIR) $(SBINDIR)
-+		cp zic zdump $(SBINDIR)/.
-+		-mkdir -p $(TOPDIR) $(BINDIR)
-+		cp tzselect $(BINDIR)/.
-+		-mkdir -p $(TOPDIR) $(MANDIR) \
- 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
- 		-rm -f $(MANDIR)/man3/newctime.3 \
- 			$(MANDIR)/man3/newtzset.3 \
-@@ -298,13 +302,11 @@
- 			$(MANDIR)/man8/zdump.8 \
- 			$(MANDIR)/man8/zic.8
- 		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
--		cp tzfile.5 $(MANDIR)/man5/.
--		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
- 
- INSTALL:	ALL install date.1
--		-mkdir $(TOPDIR) $(BINDIR)
-+		-mkdir -p $(TOPDIR) $(BINDIR)
- 		cp date $(BINDIR)/.
--		-mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-+		-mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
- 		-rm -f $(MANDIR)/man1/date.1
- 		cp date.1 $(MANDIR)/man1/.
- 
-@@ -334,9 +336,9 @@
- # You must replace all of $(TZDIR) to switch from not using leap seconds
- # to using them, or vice versa.
- other_two:	zic leapseconds $(TDATA)
--		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- 		$(ZIC) -y $(YEARISTYPE) \
--			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+			-d $(TZDIR)/right -L leapseconds $(TDATA)
- 
- posix_right:	posix_only other_two
- 
-@@ -367,7 +369,7 @@
- 			<$? >$@
- 		chmod +x $@
- 
--check:		check_tables check_web
-+check:		check_tables
- 
- check_tables:	checktab.awk $(PRIMARY_YDATA)
- 		$(AWK) -f checktab.awk $(PRIMARY_YDATA)
-diff -Naur src/tzselect.ksh src-p/tzselect.ksh
---- src/tzselect.ksh	2007-08-20 16:47:42.000000000 +0200
-+++ src-p/tzselect.ksh	2007-10-02 04:07:44.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /bin/ksh
-+#! /bin/bash
- 
- # '@(#)tzselect.ksh	8.1'
- 
diff --git a/testing/tzdata/PKGBUILD b/testing/tzdata/PKGBUILD
deleted file mode 100644
index 8829a03ef..000000000
--- a/testing/tzdata/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 141575 2011-10-31 07:41:26Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=tzdata
-pkgver=2011n
-pkgrel=1
-_tzcode=2011i
-_tzdata=2011n
-pkgdesc="Sources for time zone and daylight saving time data"
-arch=('i686' 'x86_64')
-url="http://www.twinsun.com/tz/tz-link.htm"
-license=('GPL')
-depends=()
-makedepends=()
-optdepends=('bash: required by tzselect')
-options=('!emptydirs')
-source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
-	ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz
-        #ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
-        Makefile.patch)
-md5sums=('cf7f4335b7c8682899fa2814e711c1b2'
-         '20dbfb28efa008ddbf6dd34601ea40fa'
-         'a64ed97d1fc03c66ee8612c0d9f40507')
-
-build() {
-  cd ${srcdir}
-
-  tar -xf tzcode${_tzcode}.tar.gz
-  tar -xf ${pkgname}${_tzdata}.tar.gz
-
-  patch -Np1 -i "${srcdir}/Makefile.patch"
-
-  make
-}
-
-check() {
-  cd ${srcdir}
-  make -k check # || /bin/true
-}
-
-package() {
-  cd ${srcdir}
-  make DESTDIR="${pkgdir}" install
-
-  rm "${pkgdir}/usr/share/zoneinfo/localtime"
-}
diff --git a/testing/vi/PKGBUILD b/testing/vi/PKGBUILD
deleted file mode 100644
index 3262ba0fb..000000000
--- a/testing/vi/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 142054 2011-11-04 23:27:15Z stephane $
-# Maintainer: tobias [ tobias at archlinux org ]
-
-pkgname=vi
-pkgver=050325
-pkgrel=2
-epoch=1
-pkgdesc='The original ex/vi text editor.'
-arch=('i686' 'x86_64')
-url='http://ex-vi.sourceforge.net/'
-license=('custom:ex')
-depends=('ncurses')
-optdepends=('mailx: used by the preserve command for notification')
-groups=('base')
-options=(strip !libtool emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
-        exrc.sample
-        navkeys.patch
-        increase-tube.patch
-        preserve_dir.patch)
-md5sums=('e668595254233e4d96811083a3e4e2f3'
-         'd3b483c994d859232ce369b82a4b5668'
-         'aac133930047eafa4f28736cfaf976b3'
-         'e596e05a00a24187b576e389fa1de45d'
-         '419a8755e0dd16e95542bc107e6d2b24')
-
-build() {
-  cd "${srcdir}/ex-${pkgver}"
-
-  # apply patches
-  patch -Np1 -i  ../navkeys.patch
-  patch -Np0 -i ../increase-tube.patch
-  # FS#20653
-  patch -Np1 -i ../preserve_dir.patch
-
-  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
-      'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
-}
-
-package() {
-  cd "${srcdir}/ex-${pkgver}"
-
-  make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/bin/install \
-      DESTDIR="$pkgdir" install
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/vi/exrc.sample b/testing/vi/exrc.sample
deleted file mode 100644
index 44b3045fd..000000000
--- a/testing/vi/exrc.sample
+++ /dev/null
@@ -1,5 +0,0 @@
-" A sample .exrc file. Copy it to your home dir as ~/.exrc in order to work.
-set showmode
-set noflash
-set autoindent
-set shiftwidth=2
diff --git a/testing/vi/increase-tube.patch b/testing/vi/increase-tube.patch
deleted file mode 100644
index 5010798ce..000000000
--- a/testing/vi/increase-tube.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- config.h	2005-02-19 05:25:39.000000000 -0500
-+++ config.h.fixed	2010-01-04 22:02:01.000000000 -0500
-@@ -95,8 +95,8 @@
- #define TUBESIZE        6000    /* Maximum screen size for visual */
- #else	/* VMUNIX */
- #define TUBELINES       100
--#define TUBECOLS        160
--#define TUBESIZE        16000
-+#define TUBECOLS        320
-+#define TUBESIZE        32000
- #endif	/* VMUNIX */
- 
- /*
diff --git a/testing/vi/navkeys.patch b/testing/vi/navkeys.patch
deleted file mode 100644
index 46924379c..000000000
--- a/testing/vi/navkeys.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c
---- ex-050325/ex_tty.c	2005-03-04 13:42:58.000000000 +0100
-+++ ex-050325-du/ex_tty.c	2009-06-25 20:06:57.000000000 +0200
-@@ -132,7 +132,8 @@
- 	&ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9,
- 	&HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL,
- 	&xPC, &RC, &SC, &SE, &SF, &SO, &SR, &TA, &TE, &TI, &UP, &VB, &VS, &VE,
--	&AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM
-+	&AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM,
-+ 	&kI, &kD, &kh, &at7, &kP, &kN
- };
- bool *sflags[] = {
- 	&AM, &BS, &DA, &DB, &EO, &HC,
-@@ -170,7 +171,12 @@
- 	addmac1(KD, "j", "down", arrows, 1);
- 	addmac1(KL, "h", "left", arrows, 1);
- 	addmac1(KR, "l", "right", arrows, 1);
--	addmac1(KH, "H", "home", arrows, 1);
-+	addmac1(kI, "i", "insert", arrows, 1);
-+	addmac1(kD, "x", "delete", arrows, 1);
-+	addmac1(kh, "^", "home", arrows, 1);
-+	addmac1(at7, "$", "end", arrows, 1);
-+	addmac1(kP, "", "pgup", arrows, 1);
-+	addmac1(kN, "", "pgdn", arrows, 1);
- 
- 	/*
- 	 * Handle funny termcap capabilities
-@@ -341,7 +347,7 @@
- 		*(*fp++) = flag;
- 		namp += 2;
- 	} while (*namp);
--	namp = "albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERI";
-+	namp = "albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERIkIkDkh@7kPkN";
- 	sp = sstrs;
- 	do {
- 		string = tgetstr(namp, &aoftspace);
-diff -ru ex-050325/ex_tty.h ex-050325-du/ex_tty.h
---- ex-050325/ex_tty.h	2004-12-01 19:21:06.000000000 +0100
-+++ ex-050325-du/ex_tty.h	2009-06-25 20:06:05.000000000 +0200
-@@ -183,6 +183,15 @@
- var	bool	XX;		/* Tektronix 4025 insert line */
- 	/* X? is reserved for severely nauseous glitches */
- 	/* If there are enough of these we may need bit masks! */
-+/*
-+ * Insert, Delete, Home, End, PgUp an PgDown keys
-+ */
-+var	char	*kI;
-+var	char	*kD;
-+var	char	*kh;
-+var	char	*at7;
-+var	char	*kP;
-+var	char	*kN;
- 
- /*
-  * From the tty modes...
diff --git a/testing/vi/preserve_dir.patch b/testing/vi/preserve_dir.patch
deleted file mode 100644
index 5209f7b02..000000000
--- a/testing/vi/preserve_dir.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
---- ex-050325.ori/ex.1	2005-02-17 07:39:36.000000000 -0500
-+++ ex-050325/ex.1	2011-02-01 16:21:51.496666674 -0500
-@@ -1950,7 +1950,7 @@
- .B /var/tmp/Rx\fInnnnnnnnnn\fP
- named buffer temporary
- .TP
--.B /var/preserve
-+.B /var/lib/ex
- preservation directory
- .SH DOCUMENTATION
- The document
-diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c
---- ex-050325.ori/expreserve.c	2005-03-04 07:44:46.000000000 -0500
-+++ ex-050325/expreserve.c	2011-02-01 16:22:06.583333342 -0500
-@@ -272,7 +272,7 @@
- #ifdef	notdef
- char	pattern[] =	"/usr/preserve/Exaa`XXXXX";
- #else
--char	pattern[] =	"/var/preserve/Exa`XXXXXXXXXX";
-+char	pattern[] =	"/var/lib/ex/Exa`XXXXXXXXXX";
- #endif
- 
- /*
-@@ -296,7 +296,7 @@
- 	timestamp = ctime(&time);
- 	timestamp[16] = 0;	/* blast from seconds on */
- 	putenv("MAILRC=/dev/null");
--	sprintf(cmd, "/bin/mail %s", pp->pw_name);
-+	sprintf(cmd, "/usr/bin/mail %s", pp->pw_name);
- 	setuid(getuid());
- 	mf = popen(cmd, "w");
- 	if (mf == NULL)
-diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
---- ex-050325.ori/exrecover.c	2005-03-04 07:44:46.000000000 -0500
-+++ ex-050325/exrecover.c	2011-02-01 16:21:51.496666674 -0500
-@@ -167,7 +167,7 @@
- #ifdef	notdef
- char	mydir[] =	"/usr/preserve";
- #else
--char	mydir[] =	"/var/preserve";
-+char	mydir[] =	"/var/lib/ex";
- #endif
- 
- /*
-diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec
---- ex-050325.ori/ex.spec	2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/ex.spec	2011-02-01 16:21:51.496666674 -0500
-@@ -20,7 +20,7 @@
- %define	libexecdir	%{prefix}/5lib
- %define	mandir		%{prefix}/share/man/5man
- 
--%define	preservedir	/var/preserve
-+%define	preservedir	/var/lib/ex
- 
- # install command
- %define	ucbinstall	install
-diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
---- ex-050325.ori/Makefile	2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/Makefile	2011-02-01 16:21:51.496666674 -0500
-@@ -83,7 +83,7 @@
- BINDIR		= $(PREFIX)/bin
- LIBEXECDIR	= $(PREFIX)/libexec
- MANDIR		= $(PREFIX)/share/man
--PRESERVEDIR	= /var/preserve
-+PRESERVEDIR	= /var/lib/ex
- 
- #
- # DESTDIR is prepended to the installation paths. It is mostly useful
-diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
---- ex-050325.ori/vi.1	2005-02-17 07:39:36.000000000 -0500
-+++ ex-050325/vi.1	2011-02-01 16:21:51.496666674 -0500
-@@ -979,7 +979,7 @@
- .B /var/tmp/Rx\fInnnnnnnnnn\fP
- named buffer temporary
- .TP
--.B /var/preserve
-+.B /var/lib/ex
- preservation directory
- .SH SEE ALSO
- ex(1),
diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD
deleted file mode 100644
index eb810befb..000000000
--- a/testing/vlc/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 142129 2011-11-05 11:37:27Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=1.1.12
-pkgrel=2
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libpulse: PulseAudio support'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/http/.hosts'
-        'usr/share/vlc/http/dialogs/.hosts'
-        'usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('91de1ad308c947e35380f9d747ff5713')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-faad \
-              --enable-v4l \
-              --enable-snapshot \
-              --enable-dbus-control \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --with-live555-tree=/usr/lib/live \
-              --enable-upnp \
-              --enable-realrtsp
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}
diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install
deleted file mode 100644
index 4a1091bc5..000000000
--- a/testing/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/testing/which/PKGBUILD b/testing/which/PKGBUILD
deleted file mode 100644
index a5f893aaa..000000000
--- a/testing/which/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 141957 2011-11-03 14:30:48Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=which
-pkgver=2.20
-pkgrel=5
-pkgdesc="A utility to show the full path of commands"
-arch=('i686' 'x86_64')
-url="http://www.xs4all.nl/~carlo17/which"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'sh')
-install=which.install
-source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('95be0501a466e515422cde4af46b2744')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/which/which.install b/testing/which/which.install
deleted file mode 100644
index 167e2506e..000000000
--- a/testing/which/which.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(which.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 $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/wireless_tools/PKGBUILD b/testing/wireless_tools/PKGBUILD
deleted file mode 100644
index 9354a3bb8..000000000
--- a/testing/wireless_tools/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 141706 2011-11-02 12:39:41Z tomegun $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributer: Jason Chu <jchu@xentac.net>
-
-pkgname=wireless_tools
-pkgver=29
-pkgrel=5
-pkgdesc="Wireless Tools"
-arch=('i686' 'x86_64')
-url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-license=('GPL')
-depends=('glibc')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${pkgver}.tar.gz")
-md5sums=('e06c222e186f7cc013fd272d023710cb')
-
-build() {
-	cd ${srcdir}/wireless_tools.${pkgver}
-	make
-}
-
-package() {
-	cd ${srcdir}/wireless_tools.${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/wpa_actiond/PKGBUILD b/testing/wpa_actiond/PKGBUILD
deleted file mode 100644
index ff374f5c5..000000000
--- a/testing/wpa_actiond/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 142088 2011-11-05 00:43:25Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=wpa_actiond
-pkgver=1.1
-pkgrel=3
-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=('d50a49cb5d56c31345d18e58f017b4ff923e8959a7e4e709abd156744f1668c3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make CFLAGS="${CFLAGS}"
-}
-
-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 34ddb9427..000000000
--- a/testing/wpa_supplicant/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 142085 2011-11-05 00:39:35Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=wpa_supplicant
-pkgver=0.7.3
-pkgrel=4
-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>=1.2.4' 'readline>=6.0' 'libnl')
-optdepends=('wpa_supplicant_gui: wpa_gui program')
-license=('GPL')
-groups=('base')
-backup=('etc/wpa_supplicant.conf')
-source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz
-        config dbus.patch)
-sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443'
-            '6a0837f18e5ff179ccd6954f7952dfc2e6aa69f353194ee4cb29c1ed2ef68c5d'
-            '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-  # Required by NetworkManager 0.8.995
-  patch -Np2 -i "$srcdir/dbus.patch"
-  cp "${srcdir}/config" ./.config
-  sed -i 's@/usr/local@$(PREFIX)@g' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc"
-  install -m644 wpa_supplicant.conf "${pkgdir}/etc/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 -m755 -d "${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/"
-  sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service
-  install -m755 -d "${pkgdir}/etc/dbus-1/system.d"
-  install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf"
-}
diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config
deleted file mode 100644
index 192e338f2..000000000
--- a/testing/wpa_supplicant/config
+++ /dev/null
@@ -1,404 +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
-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
-
-# Include client MLME (management frame processing) for test driver
-# This can be used to test MLME operations in hostapd with the test interface.
-# space.
-#CONFIG_CLIENT_MLME=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
-
-# 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-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
-
-# 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
-
-# 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 (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-
-# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
-# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
-# even though the core GnuTLS library is released under LGPL, this extra
-# library uses GPL and as such, the terms of GPL apply to the combination
-# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
-# apply for distribution of the resulting binary.
-#CONFIG_GNUTLS_EXTRA=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
-
-# 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, comment out 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, comment out these.
-#LIBS += -lbfd -liberty -lz
-#LIBS_p += -lbfd -liberty -lz
-#LIBS_c += -lbfd -liberty -lz
diff --git a/testing/wpa_supplicant/dbus.patch b/testing/wpa_supplicant/dbus.patch
deleted file mode 100644
index 4c5002003..000000000
--- a/testing/wpa_supplicant/dbus.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 17 Dec 2010 15:56:01 +0200
-Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
-
-The supplicant was not emitting property changed events when the BSSs
-property changed.
-
-Signed-off-by: Dan Williams <dcbw@redhat.com>
-(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
----
- wpa_supplicant/dbus/dbus_new.c |    6 ++++++
- wpa_supplicant/dbus/dbus_new.h |    1 +
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
-index bdfbbac..c66640a 100644
---- a/wpa_supplicant/dbus/dbus_new.c
-+++ b/wpa_supplicant/dbus/dbus_new.c
-@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
- 			wpas_dbus_getter_current_network;
- 		prop = "CurrentNetwork";
- 		break;
-+	case WPAS_DBUS_PROP_BSSS:
-+		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
-+		prop = "BSSs";
-+		break;
- 	default:
- 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
- 			   __func__, property);
-@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- }
-@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- 
-diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
-index 80ea98c..9cdefcb 100644
---- a/wpa_supplicant/dbus/dbus_new.h
-+++ b/wpa_supplicant/dbus/dbus_new.h
-@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
- 	WPAS_DBUS_PROP_STATE,
- 	WPAS_DBUS_PROP_CURRENT_BSS,
- 	WPAS_DBUS_PROP_CURRENT_NETWORK,
-+	WPAS_DBUS_PROP_BSSS,
- };
- 
- enum wpas_dbus_bss_prop {
--- 
-1.7.4-rc1
-
diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD
deleted file mode 100644
index a823788f5..000000000
--- a/testing/x264/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 142171 2011-11-05 11:41:36Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=x264
-pkgver=20111030
-pkgrel=1
-pkgdesc="free library for encoding H264/AVC video streams"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/x264.html"
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc')
-
-build() {
-    cd "$srcdir/$pkgname-snapshot-$pkgver-2245"
-
-    ./configure --enable-shared
-
-    make
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD
deleted file mode 100644
index e3cb8d8a5..000000000
--- a/testing/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 142165 2011-11-05 11:38:18Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.1.19
-pkgrel=6
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
-             'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
-optdepends=('imagemagick: for using the imagemagick plugin' \
-            'smbclient: for using the smb plugin' \
-            'jack: for using the jack plugin' \
-            'vcdimager: for using the vcd plugin' \
-            'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
-            'mesa: for using the opengl plugin' \
-            'libpulse: for using the pulseaudio plugin' \
-            'speex: for using the speex plugin' \
-            'v4l-utils: for using the v4l 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')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
-        xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch
-        xine-lib-1.1.19-ffmpeg.patch)
-sha1sums=('f65f762d2e16adf04b9d715c91ee0bc02c322a7d'
-          '121a8358d7919b2e51067412373f52848290338a'
-          '920bf27e6e3523dfe4cc9c802ff713e9688a3f34'
-          'd70f14c3dbb59b65c581575fa1fe13aeeb38f1b1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/xine-lib-1.1.1-configure-no-mcpu-march.patch"
-  patch -p0 -i "${srcdir}/xine-lib-1.1.19-xvmc.patch"
-  patch -p1 -i "${srcdir}/xine-lib-1.1.19-ffmpeg.patch"
-  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
-    configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
-
-  libtoolize --force --copy
-  aclocal -I m4
-  autoconf
-  automake --add-missing
-
-  ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
deleted file mode 100644
index 4b6ba9e35..000000000
--- a/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
-+++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
-@@ -161,10 +161,6 @@
-                   ;;
- 
-               esac
--              if test x"$archopt_val" != x; then
--                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--              fi
-             fi
-           else
-             dnl we have the Intel compiler
diff --git a/testing/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/testing/xine-lib/xine-lib-1.1.19-ffmpeg.patch
deleted file mode 100644
index 6817aa989..000000000
--- a/testing/xine-lib/xine-lib-1.1.19-ffmpeg.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c
---- a/src/combined/ffmpeg/ff_audio_decoder.c	Mon May 16 15:49:02 2011 +0100
-+++ b/src/combined/ffmpeg/ff_audio_decoder.c	Mon May 16 19:46:49 2011 -0400
-@@ -46,6 +46,12 @@
- 
- #define AUDIOBUFSIZE (64 * 1024)
- 
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+#  define AVAUDIO 3
-+#else
-+#  define AVAUDIO 2
-+#endif
-+
- typedef struct {
-   audio_decoder_class_t   decoder_class;
- } ff_audio_class_t;
-@@ -255,6 +261,9 @@
-       buf->decoder_info[2]);
- 
-   } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
-+#if AVAUDIO > 2
-+    AVPacket avpkt;
-+#endif
- 
-     if( !this->decoder_ok ) {
-       if ( ! this->context || ! this->codec ) {
-@@ -286,11 +295,21 @@
-     if (!this->output_open) {
-       if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
-         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+#if AVAUDIO > 2
-+	av_init_packet (&avpkt);
-+	avpkt.data = (uint8_t *)&this->buf[0];
-+	avpkt.size = this->size;
-+	avpkt.flags = AV_PKT_FLAG_KEY;
-+	avcodec_decode_audio3 (this->context,
-+			       (int16_t *)this->decode_buffer,
-+			       &decode_buffer_size, &avpkt);
-+#else
-         avcodec_decode_audio2 (this->context,
-                               (int16_t *)this->decode_buffer,
-                               &decode_buffer_size,
-                               &this->buf[0],
-                               this->size);
-+#endif
- 	this->audio_bits = this->context->bits_per_sample;
- 	this->audio_sample_rate = this->context->sample_rate;
- 	this->audio_channels = this->context->channels;
-@@ -311,12 +330,21 @@
-       offset = 0;
-       while (this->size>0) {
-         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+#if AVAUDIO > 2
-+	av_init_packet (&avpkt);
-+	avpkt.data = (uint8_t *)&this->buf[offset];
-+	avpkt.size = this->size;
-+	avpkt.flags = AV_PKT_FLAG_KEY;
-+	bytes_consumed = avcodec_decode_audio3 (this->context,
-+						(int16_t *)this->decode_buffer,
-+						&decode_buffer_size, &avpkt);
-+#else
-         bytes_consumed = avcodec_decode_audio2 (this->context,
-                                                (int16_t *)this->decode_buffer,
-                                                &decode_buffer_size,
-                                                &this->buf[offset],
-                                                this->size);
--
-+#endif
-         if (bytes_consumed<0) {
-           xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                    "ffmpeg_audio_dec: error decompressing audio frame\n");
-diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c
---- a/src/combined/ffmpeg/ff_video_decoder.c	Mon May 16 15:49:02 2011 +0100
-+++ b/src/combined/ffmpeg/ff_video_decoder.c	Mon May 16 19:46:49 2011 -0400
-@@ -58,6 +58,14 @@
- 
- #define ENABLE_DIRECT_RENDERING
- 
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+#  define AVVIDEO 2
-+#else
-+#  define AVVIDEO 1
-+#  define pp_context	pp_context_t
-+#  define pp_mode	pp_mode_t
-+#endif
-+
- /* reordered_opaque appeared in libavcodec 51.68.0 */
- #define AVCODEC_HAS_REORDERED_OPAQUE
- #if LIBAVCODEC_VERSION_INT < 0x334400
-@@ -116,8 +124,8 @@
- 
-   int               pp_quality;
-   int               pp_flags;
--  pp_context_t     *pp_context;
--  pp_mode_t        *pp_mode;
-+  pp_context       *our_context;
-+  pp_mode          *our_mode;
- 
-   /* mpeg-es parsing */
-   mpeg_parser_t    *mpeg_parser;
-@@ -444,23 +452,23 @@
-   this->pp_quality = this->class->pp_quality;
- 
-   if(this->pp_available && this->pp_quality) {
--    if(!this->pp_context && this->context)
--      this->pp_context = pp_get_context(this->context->width, this->context->height,
-+    if(!this->our_context && this->context)
-+      this->our_context = pp_get_context(this->context->width, this->context->height,
-                                         this->pp_flags);
--    if(this->pp_mode)
--      pp_free_mode(this->pp_mode);
-+    if(this->our_mode)
-+      pp_free_mode(this->our_mode);
- 
--    this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
-+    this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
-                                                     this->pp_quality);
-   } else {
--    if(this->pp_mode) {
--      pp_free_mode(this->pp_mode);
--      this->pp_mode = NULL;
-+    if(this->our_mode) {
-+      pp_free_mode(this->our_mode);
-+      this->our_mode = NULL;
-     }
- 
--    if(this->pp_context) {
--      pp_free_context(this->pp_context);
--      this->pp_context = NULL;
-+    if(this->our_context) {
-+      pp_free_context(this->our_context);
-+      this->our_context = NULL;
-     }
-   }
- }
-@@ -1055,12 +1063,26 @@
-     }
- 
-     /* skip decoding b frames if too late */
-+#if AVVIDEO > 1
-+    this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
-+#else
-     this->context->hurry_up = (this->skipframes > 0);
-+#endif
- 
-     lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
-+#if AVVIDEO > 1
-+    AVPacket avpkt;
-+    av_init_packet(&avpkt);
-+    avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
-+    avpkt.size = this->mpeg_parser->buffer_size;
-+    avpkt.flags = AV_PKT_FLAG_KEY;
-+    len = avcodec_decode_video2 (this->context, this->av_frame,
-+				 &got_picture, &avpkt);
-+#else
-     len = avcodec_decode_video (this->context, this->av_frame,
-                                 &got_picture, this->mpeg_parser->chunk_buffer,
-                                 this->mpeg_parser->buffer_size);
-+#endif
-     lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
-             len, got_picture);
-     len = current - buf->content - offset;
-@@ -1112,7 +1134,13 @@
- 
-     } else {
- 
--      if (this->context->hurry_up) {
-+      if (
-+#if AVVIDEO > 1
-+	  this->context->skip_frame != AVDISCARD_DEFAULT
-+#else
-+	  this->context->hurry_up
-+#endif
-+	 ) {
-         /* skipped frame, output a bad frame */
-         img = this->stream->video_out->get_frame (this->stream->video_out,
-                                                   this->bih.biWidth,
-@@ -1304,13 +1332,25 @@
-         got_picture = 0;
-       } else {
-         /* skip decoding b frames if too late */
-+#if AVVIDEO > 1
-+	this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
-+#else
-         this->context->hurry_up = (this->skipframes > 0);
--
-+#endif
-         lprintf("buffer size: %d\n", this->size);
-+#if AVVIDEO > 1
-+	AVPacket avpkt;
-+	av_init_packet(&avpkt);
-+	avpkt.data = (uint8_t *)&chunk_buf[offset];
-+	avpkt.size = this->size;
-+	avpkt.flags = AV_PKT_FLAG_KEY;
-+	len = avcodec_decode_video2 (this->context, this->av_frame,
-+				     &got_picture, &avpkt);
-+#else
-         len = avcodec_decode_video (this->context, this->av_frame,
-                                     &got_picture, &chunk_buf[offset],
-                                     this->size);
--
-+#endif
- #ifdef AVCODEC_HAS_REORDERED_OPAQUE
-         /* reset consumed pts value */
-         this->context->reordered_opaque = ff_tag_pts(this, 0);
-@@ -1432,7 +1472,7 @@
-                         img->base, img->pitches,
-                         img->width, img->height,
-                         this->av_frame->qscale_table, this->av_frame->qstride,
--                        this->pp_mode, this->pp_context,
-+                        this->our_mode, this->our_context,
-                         this->av_frame->pict_type);
- 
-         } else if (!this->av_frame->opaque) {
-@@ -1676,11 +1716,11 @@
-     free(this->buf);
-   this->buf = NULL;
- 
--  if(this->pp_context)
--    pp_free_context(this->pp_context);
-+  if(this->our_context)
-+    pp_free_context(this->our_context);
- 
--  if(this->pp_mode)
--    pp_free_mode(this->pp_mode);
-+  if(this->our_mode)
-+    pp_free_mode(this->our_mode);
- 
-   mpeg_parser_dispose(this->mpeg_parser);
- 
-@@ -1721,8 +1761,8 @@
-   this->aspect_ratio      = 0;
- 
-   this->pp_quality        = 0;
--  this->pp_context        = NULL;
--  this->pp_mode           = NULL;
-+  this->our_context       = NULL;
-+  this->our_mode          = NULL;
- 
-   this->mpeg_parser       = NULL;
- 
-diff -r 717450d734f7 src/post/planar/pp.c
---- a/src/post/planar/pp.c	Mon May 16 15:49:02 2011 +0100
-+++ b/src/post/planar/pp.c	Mon May 16 19:46:49 2011 -0400
-@@ -35,6 +35,12 @@
- #  include <libpostproc/postprocess.h>
- #endif
- 
-+#if LIBPOSTPROC_VERSION_MAJOR < 52
-+#  define pp_context	pp_context_t
-+#  define pp_mode	pp_mode_t
-+#  define PP_PARAMETERS_T
-+#endif
-+
- #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */
- 
- /* plugin class initialization function */
-@@ -76,14 +82,15 @@
- 
-   /* libpostproc specific stuff */
-   int                pp_flags;
--  pp_context_t      *pp_context;
--  pp_mode_t         *pp_mode;
-+  pp_context        *our_context;
-+  pp_mode           *our_mode;
- 
-   pthread_mutex_t    lock;
- };
- 
- 
- static int set_parameters (xine_post_t *this_gen, void *param_gen) {
-+#ifdef PP_PARAMETERS_T
-   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
-   pp_parameters_t *param = (pp_parameters_t *)param_gen;
- 
-@@ -92,17 +99,18 @@
-   memcpy( &this->params, param, sizeof(pp_parameters_t) );
- 
-   pthread_mutex_unlock (&this->lock);
--
-+#endif
-   return 1;
- }
- 
- static int get_parameters (xine_post_t *this_gen, void *param_gen) {
-+#ifdef PP_PARAMETERS_T
-   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
-   pp_parameters_t *param = (pp_parameters_t *)param_gen;
- 
- 
-   memcpy( param, &this->params, sizeof(pp_parameters_t) );
--
-+#endif
-   return 1;
- }
- 
-@@ -202,8 +210,8 @@
-   if(cpu_caps & MM_ACCEL_X86_3DNOW)
-     this->pp_flags |= PP_CPU_CAPS_3DNOW;
- 
--  this->pp_mode = NULL;
--  this->pp_context = NULL;
-+  this->our_mode = NULL;
-+  this->our_context = NULL;
- 
-   pthread_mutex_init (&this->lock, NULL);
- 
-@@ -248,13 +256,13 @@
-   post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen;
- 
-   if (_x_post_dispose(this_gen)) {
--    if(this->pp_mode) {
--      pp_free_mode(this->pp_mode);
--      this->pp_mode = NULL;
-+    if(this->our_mode) {
-+      pp_free_mode(this->our_mode);
-+      this->our_mode = NULL;
-     }
--    if(this->pp_context) {
--      pp_free_context(this->pp_context);
--      this->pp_context = NULL;
-+    if(this->our_context) {
-+      pp_free_context(this->our_context);
-+      this->our_context = NULL;
-     }
-     free(this);
-   }
-@@ -304,7 +312,7 @@
- 
-     pthread_mutex_lock (&this->lock);
- 
--    if( !this->pp_context ||
-+    if( !this->our_context ||
-         this->frame_width != yv12_frame->width ||
-         this->frame_height != yv12_frame->height ) {
- 
-@@ -312,32 +320,32 @@
-       this->frame_height = yv12_frame->height;
-       pp_flags = this->pp_flags;
- 
--      if(this->pp_context)
--        pp_free_context(this->pp_context);
-+      if(this->our_context)
-+        pp_free_context(this->our_context);
- 
--      this->pp_context = pp_get_context(frame->width, frame->height, pp_flags);
-+      this->our_context = pp_get_context(frame->width, frame->height, pp_flags);
- 
--      if(this->pp_mode) {
--        pp_free_mode(this->pp_mode);
--        this->pp_mode = NULL;
-+      if(this->our_mode) {
-+        pp_free_mode(this->our_mode);
-+        this->our_mode = NULL;
-       }
-     }
- 
--    if(!this->pp_mode)
--      this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode,
-+    if(!this->our_mode)
-+      this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode,
-                                                       this->params.quality);
- 
--    if(this->pp_mode)
-+    if(this->our_mode)
-       pp_postprocess(yv12_frame->base, yv12_frame->pitches,
-                      out_frame->base, out_frame->pitches,
-                      (frame->width+7)&(~7), frame->height,
-                      NULL, 0,
--                     this->pp_mode, this->pp_context,
-+                     this->our_mode, this->our_context,
-                      0 /*this->av_frame->pict_type*/);
- 
-     pthread_mutex_unlock (&this->lock);
- 
--    if(this->pp_mode) {
-+    if(this->our_mode) {
-       skip = out_frame->draw(out_frame, stream);
-       _x_post_frame_copy_up(frame, out_frame);
-     } else {
diff --git a/testing/xine-lib/xine-lib-1.1.19-xvmc.patch b/testing/xine-lib/xine-lib-1.1.19-xvmc.patch
deleted file mode 100644
index bef8b0bac..000000000
--- a/testing/xine-lib/xine-lib-1.1.19-xvmc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Quoting ChangeLog of X11's videoproto package:
-vldXvMC.h: stop uselessly including XvMClib.h
-
---- src/video_out/xxmc.h
-+++ src/video_out/xxmc.h
-@@ -77,10 +77,10 @@
- #include <X11/extensions/XShm.h>
- #include <X11/extensions/Xv.h>
- #include <X11/extensions/Xvlib.h>
-+#include <X11/extensions/XvMClib.h>
- #ifdef HAVE_VLDXVMC
-   #include <X11/extensions/vldXvMC.h>
- #else
--  #include <X11/extensions/XvMClib.h>
-   #include <X11/extensions/XvMC.h>
- #endif
- 
diff --git a/testing/xinetd/PKGBUILD b/testing/xinetd/PKGBUILD
deleted file mode 100644
index 5a2935c13..000000000
--- a/testing/xinetd/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 141988 2011-11-03 20:19:56Z tpowa $
-# Maintainer:
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=xinetd
-pkgver=2.3.14
-pkgrel=8
-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)
-md5sums=('567382d7972613090215c6c54f9b82d9'
-         'f109f699a07bc8cfb5791060f5e87f9e'
-         'ea37a2794f202e6b953d9b6956dad16a'
-         '21f47b4aa20921cfaddddd9f9a407f81'
-         '9fa2061dc7dd738c8424251deb86f81e')
-
-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 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/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 ff910321b..000000000
--- a/testing/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,193 +0,0 @@
-# $Id: PKGBUILD 141380 2011-10-30 09:03:01Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=xorg-server
-pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.11.1.902
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto')
-options=('!libtool')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        autoconfig-nvidia.patch
-        autoconfig-sis.patch
-        revert-trapezoids.patch
-        #git-fixes.patch
-        xvfb-run
-        xvfb-run.1
-        10-quirks.conf)
-sha1sums=('235a5d77420df21c8a8eed34e196168bafdbb02b'
-          '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
-          '962fecc159c128728f14e8ba231c5b00391ff4ac'
-          'd9f7d9553e772c2682c15079019d30c658a4f83b'
-          #'cd9291fe1fa1b497aa74675afeeb025fe6b23b95'
-          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
-          '6838fc00ef4618c924a77e0fb03c05346080908a'
-          '993798f3d22ad672d769dae5f48d1fa068d5578f')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Use nouveau/nv/nvidia drivers for nvidia devices
-  patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
-
-  # Use unofficial imedia SiS driver for supported SiS devices
-  patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
-
-  # Revert commit that causes huge slowdowns with binary nVidia driver
-  patch -Np1 -i "${srcdir}/revert-trapezoids.patch"
-
-  # Add post-release patches from 1.11 branch
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-
-  autoreconf -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-install-setuid \
-      --enable-config-udev \
-      --disable-config-dbus \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --sysconfdir=/etc/X11 \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -i hw/Makefile
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev)
-  backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
-  provides=('x-server')
-  groups=('xorg')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11"
-  mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/"
-  install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  rmdir "${pkgdir}/usr/share/X11"
-
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}
diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch
deleted file mode 100644
index baa2eb601..000000000
--- a/testing/xorg-server/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device *
- 	    break;
- 	case 0x102b:		    driverList[0] = "mga";	break;
- 	case 0x10c8:		    driverList[0] = "neomagic"; break;
--	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
-+	case 0x10de: case 0x12d2:
-+	    switch (dev->device_id) {
-+	    /* NV1 */
-+	    case 0x0008:
-+	    case 0x0009:
-+		driverList[0] = "vesa";
-+		break;
-+	    /* NV3 */
-+	    case 0x0018:
-+	    case 0x0019:
-+		driverList[0] = "nv";
-+		break;
-+	    default:
-+		driverList[0] = "nouveau";
-+		driverList[1] = "nv";
-+		driverList[2] = "nvidia";
-+		break;
-+	    }
-+	    break;
- 	case 0x1106:		    driverList[0] = "openchrome"; break;
-         case 0x1b36:		    driverList[0] = "qxl"; break;
- 	case 0x1163:		    driverList[0] = "rendition"; break;
diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index d936efaaa..000000000
--- a/testing/xorg-server/autoconfig-sis.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
-+++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
-@@ -1140,7 +1140,15 @@
- 		    driverList[0] = "savage"; break;
- 	    }
- 	    break;
--	case 0x1039:		    driverList[0] = "sis";	break;
-+	case 0x1039:
-+	    switch (dev->device_id)
-+	    {
-+		case 0x6350: case 0x6351:
-+		    driverList[0] = "sisimedia"; driverList[1] = "sis"; break;
-+		default:
-+		    driverList[0] = "sis"; break;
-+	    }
-+	    break;
- 	case 0x126f:		    driverList[0] = "siliconmotion"; break;
- 	case 0x121a:
- 	    if (dev->device_id < 0x0003)
diff --git a/testing/xorg-server/git-fixes.patch b/testing/xorg-server/git-fixes.patch
deleted file mode 100644
index a62524bdb..000000000
--- a/testing/xorg-server/git-fixes.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f80d23357874db19bc124dee70239fb182977883 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Mon, 17 Oct 2011 20:26:12 +0000
-Subject: Fix CVE-2011-4028: File disclosure vulnerability.
-
-use O_NOFOLLOW to open the existing lock file, so symbolic links
-aren't followed, thus avoid revealing if it point to an existing
-file.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-(cherry picked from commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34)
----
-diff --git a/os/utils.c b/os/utils.c
-index 36cb46f..9e0acb6 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -316,7 +316,7 @@ LockServer(void)
-       /*
-        * Read the pid from the existing file
-        */
--      lfd = open(LockFile, O_RDONLY);
-+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
-       if (lfd < 0) {
-         unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile);
---
-cgit v0.9.0.2-2-gbebe
-From 12f65819ffb04103f170ecd7e281348de618fc4c Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Mon, 17 Oct 2011 20:27:35 +0000
-Subject: Fix CVE-2011-4029: File permission change vulnerability.
-
-Use fchmod() to change permissions of the lock file instead
-of chmod(), thus avoid the race that can be exploited to set
-a symbolic link to any file or directory in the system.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-(cherry picked from commit b67581cf825940fdf52bf2e0af4330e695d724a4)
----
-diff --git a/os/utils.c b/os/utils.c
-index 9e0acb6..d9aa65e 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -295,7 +295,7 @@ LockServer(void)
-     FatalError("Could not create lock file in %s\n", tmp);
-   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
-   (void) write(lfd, pid_str, 11);
--  (void) chmod(tmp, 0444);
-+  (void) fchmod(lfd, 0444);
-   (void) close(lfd);
- 
-   /*
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xorg-server/revert-trapezoids.patch b/testing/xorg-server/revert-trapezoids.patch
deleted file mode 100644
index b9046c5cb..000000000
--- a/testing/xorg-server/revert-trapezoids.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ru a/fb/fbpict.c b/fb/fbpict.c
---- a/fb/fbpict.c	2011-08-01 01:44:24.000000000 +0200
-+++ b/fb/fbpict.c	2011-10-05 22:45:29.000000000 +0200
-@@ -364,7 +364,7 @@
-     ps->Glyphs = miGlyphs;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
--    ps->Trapezoids = fbTrapezoids;
-+    ps->Trapezoids = miTrapezoids;
-     ps->AddTraps = fbAddTraps;
-     ps->AddTriangles = fbAddTriangles;
-     ps->Triangles = fbTriangles;
-diff -ru a/render/mipict.c b/render/mipict.c
---- a/render/mipict.c	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mipict.c	2011-10-05 22:02:53.000000000 +0200
-@@ -573,6 +573,67 @@
-     }
- }
- 
-+void
-+miTrapezoids (CARD8	    op,
-+	      PicturePtr    pSrc,
-+	      PicturePtr    pDst,
-+	      PictFormatPtr maskFormat,
-+	      INT16	    xSrc,
-+	      INT16	    ySrc,
-+	      int	    ntrap,
-+	      xTrapezoid    *traps)
-+{
-+    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-+
-+    /*
-+     * Check for solid alpha add
-+     */
-+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-+    {
-+	for (; ntrap; ntrap--, traps++)
-+	    (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
-+    } 
-+    else if (maskFormat)
-+    {
-+	PicturePtr	pPicture;
-+	BoxRec		bounds;
-+	INT16		xDst, yDst;
-+	INT16		xRel, yRel;
-+	
-+	xDst = traps[0].left.p1.x >> 16;
-+	yDst = traps[0].left.p1.y >> 16;
-+
-+	miTrapezoidBounds (ntrap, traps, &bounds);
-+	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-+	    return;
-+	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-+					 bounds.x2 - bounds.x1,
-+					 bounds.y2 - bounds.y1);
-+	if (!pPicture)
-+	    return;
-+	for (; ntrap; ntrap--, traps++)
-+	    (*ps->RasterizeTrapezoid) (pPicture, traps, 
-+				       -bounds.x1, -bounds.y1);
-+	xRel = bounds.x1 + xSrc - xDst;
-+	yRel = bounds.y1 + ySrc - yDst;
-+	CompositePicture (op, pSrc, pPicture, pDst,
-+			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-+			  bounds.x2 - bounds.x1,
-+			  bounds.y2 - bounds.y1);
-+	FreePicture (pPicture, 0);
-+    }
-+    else
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	for (; ntrap; ntrap--, traps++)
-+	    miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
-+    }
-+}
-+
- Bool
- miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
- {
-@@ -599,7 +660,7 @@
-     ps->Composite	= 0;			/* requires DDX support */
-     ps->Glyphs		= miGlyphs;
-     ps->CompositeRects	= miCompositeRects;
--    ps->Trapezoids	= 0;
-+    ps->Trapezoids	= miTrapezoids;
-     ps->Triangles	= 0;
-     
-     ps->RasterizeTrapezoid = 0;			/* requires DDX support */
-diff -ru a/render/mipict.h b/render/mipict.h
---- a/render/mipict.h	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mipict.h	2011-10-05 22:06:19.000000000 +0200
-@@ -129,6 +129,23 @@
- 		      CARD32	    pixel,
- 		      xRenderColor  *color);
- 
-+extern _X_EXPORT PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height);
-+
-+extern _X_EXPORT void
-+miTrapezoids (CARD8	    op,
-+	      PicturePtr    pSrc,
-+	      PicturePtr    pDst,
-+	      PictFormatPtr maskFormat,
-+	      INT16	    xSrc,
-+	      INT16	    ySrc,
-+	      int	    ntrap,
-+	      xTrapezoid    *traps);
-+
- extern _X_EXPORT Bool
- miIsSolidAlpha (PicturePtr pSrc);
- 
-diff -ru a/render/mitrap.c b/render/mitrap.c
---- a/render/mitrap.c	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mitrap.c	2011-10-05 22:05:29.000000000 +0200
-@@ -34,6 +34,55 @@
- #include "picturestr.h"
- #include "mipict.h"
- 
-+PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height)
-+{
-+    PixmapPtr	    pPixmap;
-+    PicturePtr	    pPicture;
-+    GCPtr	    pGC;
-+    int		    error;
-+    xRectangle	    rect;
-+
-+    if (width > 32767 || height > 32767)
-+	return 0;
-+
-+    if (!pPictFormat)
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	if (!pPictFormat)
-+	    return 0;
-+    }
-+
-+    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
-+					pPictFormat->depth, 0);
-+    if (!pPixmap)
-+	return 0;
-+    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
-+    if (!pGC)
-+    {
-+	(*pScreen->DestroyPixmap) (pPixmap);
-+	return 0;
-+    }
-+    ValidateGC (&pPixmap->drawable, pGC);
-+    rect.x = 0;
-+    rect.y = 0;
-+    rect.width = width;
-+    rect.height = height;
-+    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
-+    FreeScratchGC (pGC);
-+    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
-+			      0, 0, serverClient, &error);
-+    (*pScreen->DestroyPixmap) (pPixmap);
-+    return pPicture;
-+}
-+
- static xFixed
- miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)
- {
-
diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run
deleted file mode 100644
index 4c2f4e0d3..000000000
--- a/testing/xorg-server/xvfb-run
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Clean up files
-clean_up() {
-    if [ -e "$AUTHFILE" ]; then
-        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
-    fi
-    if [ -n "$XVFB_RUN_TMPDIR" ]; then
-        if ! rm -r "$XVFB_RUN_TMPDIR"; then
-            error "problem while cleaning up temporary directory"
-            exit 5
-        fi
-    fi
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! which xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
-    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-XVFBPID=$!
-sleep "$STARTWAIT"
-if ! kill -0 $XVFBPID 2>/dev/null; then
-  echo "Xvfb failed to start" >&2
-  exit 1
-fi
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1
deleted file mode 100644
index 137d3a196..000000000
--- a/testing/xorg-server/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-11-15 11:37:21 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-11-15 11:37:21 -0300
commit	a1ae9076f18ec51553e17dfe867f95b6b4931362 (patch)
tree	c0ca52078abd65c9f3d4c40cf871bbae7d17d5c2
parent	7caeeae33fd491dbea5044168bbc50197963118c (diff)
parent	28b13b7e8e6e1e4fa1593f0dfb1c37569f2f90a8 (diff)